Some logic changes in get()