NEW: Felipe's changes

Changes that Felipe made, but wasn't able to push them due to the error.