Updated the baseModel

Have not tested these yet!