adapted to awesome 3.5