Trying to fix this big mess