New  requirements. Minor changes in code