more of original code