code update from dr87