ADd functionalitty and tests for userCode change