still trying ot fix bug