Updates by Rivkine project's engineering