Added: some smell code for faving