Added yaw/pitch and buffers