added all stufs