--Implemented where clausure
--fixed 301 managment error