refactoring
removed aiming as the implementation was wrong to begin with