modify to enhance WAQL interfaces