Started work on updating model