Merge with jack
Really Merged Now