Updated Functions for readability