Adapted code to new names
Added book dweller