Added angle offset (still unimplemented)