add block modifier padding.., reorg code..