Made some basic changes