Made the final changes necessary for merge