Fixing based on Ryan's feedback