added some weird angles to the working calculation