restore previously removed functionality and code improvements