Working version nearly rc1