Updates by ozzlyn vince