updated for awesome 3.5