Added some more stuff. Known issue with if else