updates thanks to luanne