more work on Aim
even more work on Aim