Thanks, it's working now. In the next commit I can remove the commenting-out.