Updated for few rendering issues