a few changes, corrections have to be made