brought back brad's changes