Modified quite a few things
modified quite a few thinsg