fixed all this shit