adding some handling for multiple contexts