Made more universally