New modifications based on discussions