Updated Model with some functions (Simon)