Made it friendly and more agnostic