Further work on padding etc