some changes in order to meet requirements of iteration #1 - still not done!