Fixed set variable bug
Added new files
Updated if-statement