Updated files

Added/Removed a few lines of code