Added figure, more refactoring