Reworked the restart mechanism & added apk