Made more user friendly