Merged old code with latest