improve the simplicity for changing