Move hook so it works for fancy graphics as well