changes, ready for testing