finished changes for alias