merge jakes stuff