v2.3, issues fixed