Updated to current layout