two versions fixed and made backup points (one exploting thesis utilities)