committing before merging juan's code