Ok done with changes and ready for the second review