Initial transition to awesome 3.5