Added initial logic