Fix Performance
update