Cesar's changes.
Cesar changed stuff. merged.