fixing up fucking solution