Made some updates(although still incomplete)