further changes:stage 1