Removed methode, and changed a unless to if.