modified file to prevent redundancy