changing degrees, removing warning...
merging