Base Code merged to SPIN 2.4