Made Orm better, part 2