Few more changes to render