First part of 1.1 done