Update remarks and padding