@kelstopper does comment still apply with the most recent changes? or should the comment be removed?