added a lot of thins..