Made more user-friendly