Ready for testing
some deleting