commit of Ashiru's code