maybe half of mick changes made