Initial lbb design changes