fixing ALL the thins #15