Added replacing (16/39)

Added replacing