Applying sblanc's feedback