Completed feature 3 and 4.