added lot of things