Moved separate expected limit calculator