Add flowers and refactor