Update: Add surface model computation to overflow
and clean up functions.