added more stufs