Changes based on the feedback of couzteau