addressing code review comments
adding back elements.inc