added delegates made some updates