almost finished fixing