merged newer, missing code into original code