Implemented @kidfribble's feedback