Adding little more code, one step at a time