Bring up to awesome 3.5