commited out 1) and 2)