Marcos' changes