Change to using new function during newcomer check