Completed with layout and structure