committed the stuff the Candic3 changed
changed the file and merged