disable errors removed. ready to be merged