Added Some delegate stuff