maybe this will fix the structure