Updated on why this was needed