Added initial set-up