Wondering if this should be more intelligent...