changed the structure of the costheta branch and reversed me to be emass to comform to the ipmplicit declarations