Commit #19:  Fixed shitty coding