updated for beta 0.6.5