added some logic, Nitrous crashed, lame