catching up with fixes made during transition..