merged alpha-0.6