Updated Collivery Class
Bug fixes: speed issues