added @paultag suggestions