modernize these statements a bit