Redid context search and created function to do so