Made some basic changes
Made some basic changes