Updated files, resolved #2 wrong number of arguments (8 for 7)