Code revised in user module