Ready for test

Final   changes, ready for test