fixing this shit still