Monday´s last changes
Merge with farid hardcoded