Rich D: added some hooks just for demo purposes