ok sorta fixed