Implemented both files together