Code and Database updated