Merged Code and Db update.