easy changes, getting ready for final rework