ticket:4. Last updated version. Tests and view modified