more work on presence support