added stuff i accidentialy deleted