everything should now agree with the new layout