Updated Model a bit