@esevick: #6.6
@esevick: #6.0
@esevick: #2.7
@esevick: #2.2