nicening this up