Added code updates