Updated to work better with sticky notes server