resync

attempting to make sure its the final version