added stuff that wasn't changed in last commit