worked on coupling
fixed merge conflict