fixed jays demands 2,3 and 5