applied comments from Mark