changes from CubePC implemented