Implement new behavior based on discussion