made the new code easier on my syntax highlighter