Made several changes to both files