Small changes, trying to get it to work