Added initial set up