Made some changes to my test branch

@meshy well i made a comment anyway