Changing type-aware - 3