fixed and possibly added stuff? (not sure about the added part)