restructure. not sure if it helped...