changed according to working copy of code