modified for release build