New system now semi-working