Finished moteraction #20 and adapted to new format