migrate to dj1.5, part 1