re-added stuff that got lost yesterday