some changes for Planet2