commited out somethings