Edited by Thor

I would definitely take these changes into consideration.