Improved change component