added stuff that was removed