putting missed merge stuff back in