Had a look at what is already done, made minor changes