added more stuff's