UPDATE: Initial modification for CR dojo