Added more stuff to strong-arm