fixing more shits