updates for alias, should now be tested more