(#9) - change construct to first include