completed issue 3
completed issue 4