Added before and after draw hooks