Add initial logic