commit before merge
add the elastic effect