add new files and modified category logic