fixed bug from last week, working now