Updated with changed aim constructor