Removed category dependancy