Made attempt at changing structure, didn't work.