updating code
ready for testing