updated/added functions for readability