before merge
padding needs to be removed
added headers