added finder, guard, rspec