Refactor and add course 4 and 5