Updated item based and user based code