Made more compatible for out use