final master changes until merge