merged new code