maltes
committed
on 24 Oct 05
Moved callbacks to the appropriate place