Switched to int calculations