changed modificators logic;