Ready for testing
fixed merge conflicts