last changes
merge with Cesar changes