done before enhancements