Added a few more lines, still unsure if good.