Moved init logic so stop can reinitialise variables