readding code that was removed in a merge