bug fixed. Pilot version