Changes suggested by Jose