more changes from cubePC