Final version stage 2