Added similar to subrubic model. Minor bugs fixed.