after refactor and correction and resolve
mod2