some changes : fit for opencocon