Merged new code