shortcuts, refactor everything hoho