keeping dfas.py up to date with master for purposes of testing
added code for if statements