0.6.3 version rebased