added stuff but not sure exactly