improving the first subsection