Taking account for angle, needs work