more changes (following tutorial)