Small changes, trying to merge