updated for 0.4 hack