Huge changes on previos commit