36 and 37

sped up solution of 35