marcio changes( first screen and second) and my changes( third screen)