updates thanks to 6a2f33a821