finally fixed alls