enhancements done after full read through