Update on new layout and logic