Story #1622 Task #1623 Add picture and change some code