Changes on obj and aim