Few changes to get it to compile and run.