Revert 394f344..9ad3649

This rolls back to commit 394f344f4ff13f50e4f2c31c7e8a38750c92e99a.
copy and paste arturo's script changes
merging with arturo's branch
fuck