Refactor, add Bullet orientation