updated for 1.4 beta