cleaned up commit to work properly with ARIES