Updated to layout 4