final update 0.2