renamed file and updated code and query