replace ArrayList -> List