Added shape factor modifications and output to mechanical outputs