Getting into a possible launch quality
Fixed merge