still trying to fix this shit