added funciontalities, not working actually