Removed gp, added ga aliases