Horse Update

Closes #307