Initial tweak to test layout scheme