Working on modes 2 and 3