trying to get things in sync a bit better