Porting to IDEA, part 2