did some small changes -r800