Changes for ease of use