new code fixes