Small changes, following tutorial