Implement a solution for feature #5