additional within functionality and tests