Added autoaim capability