Adapted some parts to new determ. systems.