removed extraaneous stuff