files modified on Darko's and Igors's suggestions - pt 1