added last content
code quality mentioned...