Finished new and upate