removed unneccessary and arm
reinserted arm for now, until dependecy is cleaned up. fixed tests