reapplying @tollman's changes