worked on tasks #30 and #31
merging the changes