new functions and aliases, split files for organization