1300, 2048 sizes working fine & code refactored