change from functions to aliases