much tighter layout this time