updated to different layout