latest version before Omar's integration