Added linearized ASBM and cleaned up V2F