Small changes
Working version on mac