Adapt for Contextly more smoothly