added lock and spin contorls