Refactor contd