Improve performance, Update Design