Added Padding Detection