Fix & Changes