further unitized code