merging all changes since Friday BOOYAH