updates based on Debo's feedback