New changes related to padding etc.