adding some new aliases from actual work machine
lazy merge