uncommented a lot of stuff