Now working! Remove diagnostic messages