updated with layout