Added initial preparation