Compiled Luis' changes