Implemented correct targetting behaviour