moved duplicated code to new included element
(more secrets)