fix for some of requirements