finishes making all functionality working again