From 23b5c7778fc4591c72360909bcb714b0b3aa28f6 Mon Sep 17 00:00:00 2001
From: rinaschedl <rinaschedl@gmx.at>
Date: Wed, 29 Jul 2026 11:01:36 +0200
Subject: [PATCH 1/7] CATROID-1106: GlideToPositionBrick

A new Brick (Feature) is created.
The Brick has 3 options:
-random position
	- the sprite glides to a random position
-touch position
	- the player has to touch a position where the sprite then goes
-other sprite position
	- the sprite glides and at the moment follows a other sprite
	  till the other sprite stops.
	- this part is not finally discussed: may we change it so that
	  the sprite goes to the startposition from the other sprite, if
	  it moves too

TestGlideToRandomPositionDestination Test; flact:red

TestGlideToRandomPositionDestination flact:green; createGlidetoRandomPositionAction;

Refactoring and knew Test: GlideBehavior, bove Tests are green

show Brick in Bricklist with the correct attributs. Attributes don't work yet.

changed all glide_to_.... to glide_to_position_... so to better distinguish between.

last commit before PairProgramming Session with Thomas

glideToTouchPosition ready, brick test by hand and the tests are grenn

refactor the ActionTest: canceled all deprecated lines; correct misspellings;

add GlideToOtherSpritePosition

refactor GlideToRandomPositionAction.kt

Refactoring all files that changed in the ticket Catroid-1106

Refactoring all files that changed in the ticket Catroid-1106
---
 .idea/.name                                   |   1 -
 .idea/codeStyles/Project.xml                  |   1 +
 .run/Pull Request Suite.run.xml               |  15 +-
 .run/Testrunner Tests.run.xml                 |  19 +-
 .../actions/GlideToTouchPositionActionTest.kt | 110 +++++++
 .../catrobat/catroid/common/BrickValues.java  |   4 +
 .../catroid/content/ActionFactory.java        | 283 ++++++++++--------
 .../org/catrobat/catroid/content/Scope.kt     |   2 +-
 .../GlideToOtherSpritePositionAction.kt       |  64 ++++
 .../actions/GlideToRandomPositionAction.kt    |  62 ++++
 .../actions/GlideToTouchPositionAction.kt     |  70 +++++
 .../content/bricks/GlideToPositionBrick.kt    | 134 +++++++++
 .../ui/fragment/CategoryBricksFactory.kt      |   6 +-
 .../res/layout/brick_glide_to_position.xml    |  75 +++++
 catroid/src/main/res/values/strings.xml       |   2 +
 .../GlideToOtherSpritePositionActionTest.kt   | 104 +++++++
 .../GlideToRandomPositionActionTest.kt        | 111 +++++++
 .../actions/GoToRandomPositionActionTest.kt   |   2 +-
 gradle.properties                             |   3 +
 settings.gradle                               |   4 +-
 20 files changed, 922 insertions(+), 150 deletions(-)
 delete mode 100644 .idea/.name
 create mode 100644 catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/GlideToTouchPositionActionTest.kt
 create mode 100644 catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToOtherSpritePositionAction.kt
 create mode 100644 catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToRandomPositionAction.kt
 create mode 100644 catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToTouchPositionAction.kt
 create mode 100644 catroid/src/main/java/org/catrobat/catroid/content/bricks/GlideToPositionBrick.kt
 create mode 100644 catroid/src/main/res/layout/brick_glide_to_position.xml
 create mode 100644 catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToOtherSpritePositionActionTest.kt
 create mode 100644 catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToRandomPositionActionTest.kt

diff --git a/.idea/.name b/.idea/.name
deleted file mode 100644
index 419372801c8..00000000000
--- a/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-Catroid
\ No newline at end of file
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 24cd8c6e312..874d47a4e60 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,6 +6,7 @@
       </value>
     </option>
     <option name="LINE_SEPARATOR" value="&#10;" />
+    <option name="RIGHT_MARGIN" value="150" />
     <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <JavaCodeStyleSettings>
diff --git a/.run/Pull Request Suite.run.xml b/.run/Pull Request Suite.run.xml
index c53e674febf..f31ae8bf46a 100644
--- a/.run/Pull Request Suite.run.xml	
+++ b/.run/Pull Request Suite.run.xml	
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Pull Request Suite" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
-    <module name="Catroid.catroid.androidTest" />
+    <module name="catrobat.catroid" />
+    <option name="ANDROID_TEST_RUN_CONFIGURATION_SCHEMA_VERSION" value="0" />
     <option name="TESTING_TYPE" value="2" />
     <option name="METHOD_NAME" value="" />
     <option name="CLASS_NAME" value="org.catrobat.catroid.testsuites.UiEspressoPullRequestTriggerSuite" />
@@ -8,15 +9,9 @@
     <option name="TEST_NAME_REGEX" value="" />
     <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
     <option name="EXTRA_OPTIONS" value="" />
-    <option name="RETENTION_ENABLED" value="No" />
-    <option name="RETENTION_MAX_SNAPSHOTS" value="2" />
-    <option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />
     <Auto>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -25,7 +20,6 @@
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
       <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Auto>
     <Hybrid>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -34,11 +28,9 @@
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
       <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Hybrid>
     <Java>
       <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Java>
     <Native>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -47,13 +39,12 @@
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
       <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="LeakCanary" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>
diff --git a/.run/Testrunner Tests.run.xml b/.run/Testrunner Tests.run.xml
index 21e79589a59..ac13c9b83f1 100644
--- a/.run/Testrunner Tests.run.xml	
+++ b/.run/Testrunner Tests.run.xml	
@@ -1,6 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Testrunner Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
-    <module name="Catroid.catroid.androidTest" />
+    <module name="catrobat.catroid" />
+    <option name="ANDROID_TEST_RUN_CONFIGURATION_SCHEMA_VERSION" value="0" />
     <option name="TESTING_TYPE" value="1" />
     <option name="METHOD_NAME" value="" />
     <option name="CLASS_NAME" value="" />
@@ -8,15 +9,9 @@
     <option name="TEST_NAME_REGEX" value="" />
     <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
     <option name="EXTRA_OPTIONS" value="" />
-    <option name="RETENTION_ENABLED" value="No" />
-    <option name="RETENTION_MAX_SNAPSHOTS" value="2" />
-    <option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />
     <Auto>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -24,6 +19,7 @@
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
     </Auto>
     <Hybrid>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -31,23 +27,26 @@
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
     </Hybrid>
-    <Java />
+    <Java>
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+    </Java>
     <Native>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
       <option name="SHOW_STATIC_VARS" value="true" />
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="LeakCanary" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-      <option name="PROFILING_MODE" value="NOT_SET" />
     </Profilers>
     <method v="2">
       <option name="Android.Gradle.BeforeRunTask" enabled="true" />
diff --git a/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/GlideToTouchPositionActionTest.kt b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/GlideToTouchPositionActionTest.kt
new file mode 100644
index 00000000000..a45c845a81b
--- /dev/null
+++ b/catroid/src/androidTest/java/org/catrobat/catroid/test/content/actions/GlideToTouchPositionActionTest.kt
@@ -0,0 +1,110 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2026 The Catrobat Team
+ * (<http://developer.catrobat.org/credits>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * An additional term exception under section 7 of the GNU Affero
+ * General Public License, version 3, is available at
+ * http://developer.catrobat.org/license_additional_term
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.catrobat.catroid.test.content.actions
+
+import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction
+import org.catrobat.catroid.ProjectManager
+import org.catrobat.catroid.common.BrickValues
+import org.catrobat.catroid.common.ScreenValues
+import org.catrobat.catroid.content.Project
+import org.catrobat.catroid.content.Scene
+import org.catrobat.catroid.content.Sprite
+import org.catrobat.catroid.content.actions.GlideToTouchPositionAction
+import org.catrobat.catroid.formulaeditor.Formula
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import org.catrobat.catroid.utils.TouchUtil
+import org.koin.java.KoinJavaComponent
+
+@RunWith(AndroidJUnit4::class)
+class GlideToTouchPositionActionTest {
+
+    private lateinit var sprite: Sprite
+    private lateinit var action: GlideToTouchPositionAction
+    private  val EXPECTED_X_POSITION =20f;
+    private  val EXPECTED_Y_POSITION =40f;
+    private val projectManager: ProjectManager by KoinJavaComponent.inject(ProjectManager::class.java)
+
+    @Before
+    @Throws(Exception::class)
+    fun SetUp() {
+
+
+        val project = Project()
+        projectManager.currentProject = project
+        val scene = Scene()
+        project.addScene(scene)
+        projectManager.currentlyPlayingScene = scene
+        sprite = Sprite("testSprite")
+        scene.addSprite(sprite)
+        ScreenValues.setToDefaultScreenSize()
+        action = sprite.actionFactory.createGlideToPositionAction(
+            sprite, null, SequenceAction(), Formula(2.0),
+            BrickValues.GLIDE_TO_TOUCH_POSITION
+        )
+            as GlideToTouchPositionAction
+    }
+
+    @Test
+    public fun testGlideToTouchPositionDestination() {
+
+        sprite.look.xInUserInterfaceDimensionUnit = 0f
+        sprite.look.yInUserInterfaceDimensionUnit = 0f
+
+        assertEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+
+        TouchUtil.touchDown(EXPECTED_X_POSITION, EXPECTED_Y_POSITION, 0)
+
+        action.act(2.0F)
+
+        assertEquals(EXPECTED_Y_POSITION, sprite.look.yInUserInterfaceDimensionUnit)
+        assertEquals(EXPECTED_X_POSITION, sprite.look.xInUserInterfaceDimensionUnit)
+    }
+
+    @Test
+    public fun testGlideToBehavior(){
+        sprite.look.xInUserInterfaceDimensionUnit = 0f
+        sprite.look.yInUserInterfaceDimensionUnit = 0f
+
+        assertEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+
+        TouchUtil.touchDown(EXPECTED_X_POSITION, EXPECTED_Y_POSITION, 0)
+        action.act(1.0f)
+
+        assertNotEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertNotEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+        assertNotEquals(EXPECTED_X_POSITION, sprite.look.xInUserInterfaceDimensionUnit)
+        assertNotEquals(EXPECTED_Y_POSITION, sprite.look.yInUserInterfaceDimensionUnit)
+        assertEquals(action.currentXPosition, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(action.currentYPosition, sprite.look.yInUserInterfaceDimensionUnit)
+    }
+}
diff --git a/catroid/src/main/java/org/catrobat/catroid/common/BrickValues.java b/catroid/src/main/java/org/catrobat/catroid/common/BrickValues.java
index 2c3e8901757..5361d7c1c4d 100644
--- a/catroid/src/main/java/org/catrobat/catroid/common/BrickValues.java
+++ b/catroid/src/main/java/org/catrobat/catroid/common/BrickValues.java
@@ -67,6 +67,10 @@ public final class BrickValues {
 	public static final int GO_TO_TOUCH_POSITION = 80;
 	public static final int GO_TO_RANDOM_POSITION = 81;
 	public static final int GO_TO_OTHER_SPRITE_POSITION = 82;
+	public static final int GLIDE_TO_TOUCH_POSITION = 1;
+	public static final int GLIDE_TO_RANDOM_POSITION = 0;
+	public static final int GLIDE_TO_OTHER_SPRITE_POSITION = 2;
+
 	public static final int SET_LOOK_BY_INDEX = 1;
 	public static final String PARTICLE_COLOR = "#ff0000";
 
diff --git a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
index bf57365f012..0894c19fa8a 100644
--- a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
+++ b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
@@ -68,7 +68,10 @@
 import org.catrobat.catroid.content.actions.FlashAction;
 import org.catrobat.catroid.content.actions.ForItemInUserListAction;
 import org.catrobat.catroid.content.actions.ForVariableFromToAction;
+import org.catrobat.catroid.content.actions.GlideToOtherSpritePositionAction;
 import org.catrobat.catroid.content.actions.GlideToPhysicsAction;
+import org.catrobat.catroid.content.actions.GlideToRandomPositionAction;
+import org.catrobat.catroid.content.actions.GlideToTouchPositionAction;
 import org.catrobat.catroid.content.actions.GoNStepsBackAction;
 import org.catrobat.catroid.content.actions.GoThroughAction;
 import org.catrobat.catroid.content.actions.GoToOtherSpritePositionAction;
@@ -206,6 +209,7 @@
 import org.catrobat.catroid.content.bricks.brickspinner.PickableDrum;
 import org.catrobat.catroid.content.bricks.brickspinner.PickableMusicalInstrument;
 import org.catrobat.catroid.formulaeditor.Formula;
+import org.catrobat.catroid.formulaeditor.InterpretationException;
 import org.catrobat.catroid.formulaeditor.UserData;
 import org.catrobat.catroid.formulaeditor.UserList;
 import org.catrobat.catroid.formulaeditor.UserVariable;
@@ -234,7 +238,7 @@ public EventAction createUserBrickAction(Sprite sprite, SequenceAction sequence,
 			List<UserDefinedBrickInput> userDefinedBrickInputs, UUID userDefinedBrickID) {
 		UserDefinedBrickAction action = action(UserDefinedBrickAction.class);
 
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setInputs(userDefinedBrickInputs);
 		action.setUserDefinedBrickID(userDefinedBrickID);
@@ -252,7 +256,7 @@ public EventAction createBroadcastAction(String broadcastMessage, boolean wait)
 
 	public Action createWaitAction(Sprite sprite, SequenceAction sequence, Formula delay) {
 		WaitAction action = action(WaitAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDelay(delay);
 		return action;
@@ -262,7 +266,7 @@ public Action createWaitForSoundAction(Sprite sprite, SequenceAction sequence, F
 			String soundFilePath) {
 		WaitForSoundAction action = action(WaitForSoundAction.class);
 		action.setSoundFilePath(soundFilePath);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDelay(delay);
 		return action;
@@ -271,7 +275,7 @@ public Action createWaitForSoundAction(Sprite sprite, SequenceAction sequence, F
 	public Action createPlaySoundAtAction(Sprite sprite, SequenceAction sequence, Formula delay,
 			SoundInfo sound) {
 		PlaySoundAtAction action = action(PlaySoundAtAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setSprite(sprite);
 		action.setSound(sound);
 		action.setScope(scope);
@@ -279,9 +283,10 @@ public Action createPlaySoundAtAction(Sprite sprite, SequenceAction sequence, Fo
 		return action;
 	}
 
-	public Action createWaitForBubbleBrickAction(Sprite sprite, SequenceAction sequence, Formula delay) {
+	public Action createWaitForBubbleBrickAction(Sprite sprite, SequenceAction sequence,
+			Formula delay) {
 		WaitForBubbleBrickAction action = Actions.action(WaitForBubbleBrickAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDelay(delay);
 		return action;
@@ -290,7 +295,7 @@ public Action createWaitForBubbleBrickAction(Sprite sprite, SequenceAction seque
 	public Action createChangeBrightnessByNAction(Sprite sprite, SequenceAction sequence,
 			Formula changeBrightness) {
 		ChangeBrightnessByNAction action = Actions.action(ChangeBrightnessByNAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setBrightness(changeBrightness);
 		return action;
@@ -299,7 +304,7 @@ public Action createChangeBrightnessByNAction(Sprite sprite, SequenceAction sequ
 	public Action createChangeColorByNAction(Sprite sprite, SequenceAction sequence,
 			Formula changeColor) {
 		ChangeColorByNAction action = Actions.action(ChangeColorByNAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setColor(changeColor);
 		return action;
@@ -308,7 +313,7 @@ public Action createChangeColorByNAction(Sprite sprite, SequenceAction sequence,
 	public Action createChangeTransparencyByNAction(Sprite sprite, SequenceAction sequence,
 			Formula transparency) {
 		ChangeTransparencyByNAction action = Actions.action(ChangeTransparencyByNAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setTransparency(transparency);
 		return action;
@@ -316,23 +321,25 @@ public Action createChangeTransparencyByNAction(Sprite sprite, SequenceAction se
 
 	public Action createChangeSizeByNAction(Sprite sprite, SequenceAction sequence, Formula size) {
 		ChangeSizeByNAction action = Actions.action(ChangeSizeByNAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSize(size);
 		return action;
 	}
 
-	public Action createChangeVolumeByNAction(Sprite sprite, SequenceAction sequence, Formula volume) {
+	public Action createChangeVolumeByNAction(Sprite sprite, SequenceAction sequence,
+			Formula volume) {
 		ChangeVolumeByNAction action = Actions.action(ChangeVolumeByNAction.class);
 		action.setVolume(volume);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
 
-	public Action createChangeXByNAction(Sprite sprite, SequenceAction sequence, Formula xMovement) {
+	public Action createChangeXByNAction(Sprite sprite, SequenceAction sequence,
+			Formula xMovement) {
 		ChangeXByNAction action = Actions.action(ChangeXByNAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setxMovement(xMovement);
 		return action;
@@ -340,7 +347,7 @@ public Action createChangeXByNAction(Sprite sprite, SequenceAction sequence, For
 
 	public Action createChangeYByNAction(Sprite sprite, SequenceAction sequence, Formula yMovement) {
 		ChangeYByNAction action = Actions.action(ChangeYByNAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setyMovement(yMovement);
 		return action;
@@ -370,17 +377,46 @@ public Action createGlideToAction(Sprite sprite, SequenceAction sequence, Formul
 		GlideToAction action = Actions.action(GlideToAction.class);
 		action.setPosition(x, y);
 		action.setDuration(duration);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
 
+	public Action createGlideToPositionAction(Sprite sprite,
+			Sprite destinationSprite, SequenceAction sequence,
+			Formula duration, int spinnerSelection) throws InterpretationException {
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		switch (spinnerSelection) {
+			case BrickValues.GLIDE_TO_RANDOM_POSITION:
+				GlideToRandomPositionAction randomAction =
+						action(GlideToRandomPositionAction.class);
+				randomAction.setScope(scope);
+				randomAction.setDuration(duration.interpretFloat(scope));
+				return randomAction;
+			case BrickValues.GLIDE_TO_TOUCH_POSITION:
+				GlideToTouchPositionAction touchAction =
+						action(GlideToTouchPositionAction.class);
+				touchAction.setScope(scope);
+				touchAction.setDuration(duration.interpretFloat(scope));
+				return touchAction;
+			case BrickValues.GLIDE_TO_OTHER_SPRITE_POSITION:
+				GlideToOtherSpritePositionAction otherSpritePositionAction =
+						action(GlideToOtherSpritePositionAction.class);
+				otherSpritePositionAction.setScope(scope);
+				otherSpritePositionAction.setDuration(duration.interpretFloat(scope));
+				otherSpritePositionAction.setDestinationSprite(destinationSprite);
+				return otherSpritePositionAction;
+			default:
+				return null;
+		}
+	}
+
 	public Action createPlaceAtAction(Sprite sprite, SequenceAction sequence, Formula x, Formula y) {
 		GlideToAction action = Actions.action(GlideToAction.class);
 		action.setPosition(x, y);
 		action.setDuration(0);
 		action.setInterpolation(null);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -408,7 +444,7 @@ public Action createGoToAction(Sprite sprite, Sprite destinationSprite, int spin
 
 	public Action createGoNStepsBackAction(Sprite sprite, SequenceAction sequence, Formula steps) {
 		GoNStepsBackAction action = Actions.action(GoNStepsBackAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSteps(steps);
 		return action;
@@ -431,7 +467,7 @@ public Action createLegoNxtMotorMoveAction(Sprite sprite, SequenceAction sequenc
 			LegoNxtMotorMoveBrick.Motor motorEnum, Formula speed) {
 		LegoNxtMotorMoveAction action = Actions.action(LegoNxtMotorMoveAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSpeed(speed);
 		return action;
@@ -447,7 +483,7 @@ public Action createLegoNxtMotorTurnAngleAction(Sprite sprite, SequenceAction se
 			LegoNxtMotorTurnAngleBrick.Motor motorEnum, Formula degrees) {
 		LegoNxtMotorTurnAngleAction action = Actions.action(LegoNxtMotorTurnAngleAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegrees(degrees);
 		return action;
@@ -457,7 +493,7 @@ public Action createLegoNxtPlayToneAction(Sprite sprite, SequenceAction sequence
 			Formula durationInSeconds) {
 		LegoNxtPlayToneAction action = Actions.action(LegoNxtPlayToneAction.class);
 		action.setHertz(hertz);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationInSeconds(durationInSeconds);
 		return action;
@@ -466,7 +502,7 @@ public Action createLegoNxtPlayToneAction(Sprite sprite, SequenceAction sequence
 	public Action createLegoEv3SingleMotorMoveAction(Sprite sprite, SequenceAction sequence,
 			LegoEv3MotorMoveBrick.Motor motorEnum, Formula speed) {
 		LegoEv3MotorMoveAction action = action(LegoEv3MotorMoveAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setMotorEnum(motorEnum);
 		action.setSpeed(speed);
@@ -489,7 +525,7 @@ public Action createLegoEv3PlayToneAction(Sprite sprite, SequenceAction sequence
 			Formula hertz, Formula durationInSeconds, Formula volumeInPercent) {
 		LegoEv3PlayToneAction action = action(LegoEv3PlayToneAction.class);
 		action.setHertz(hertz);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationInSeconds(durationInSeconds);
 		action.setVolumeInPercent(volumeInPercent);
@@ -500,7 +536,7 @@ public Action createLegoEv3MotorTurnAngleAction(Sprite sprite, SequenceAction se
 			LegoEv3MotorTurnAngleBrick.Motor motorEnum, Formula degrees) {
 		LegoEv3MotorTurnAngleAction action = action(LegoEv3MotorTurnAngleAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegrees(degrees);
 		return action;
@@ -510,7 +546,7 @@ public Action createPhiroPlayToneActionAction(Sprite sprite, SequenceAction sequ
 			PhiroPlayToneBrick.Tone toneEnum, Formula duration) {
 		PhiroPlayToneAction action = action(PhiroPlayToneAction.class);
 		action.setSelectedTone(toneEnum);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationInSeconds(duration);
 		return action;
@@ -520,7 +556,7 @@ public Action createPhiroMotorMoveForwardActionAction(Sprite sprite, SequenceAct
 			PhiroMotorMoveForwardBrick.Motor motorEnum, Formula speed) {
 		PhiroMotorMoveForwardAction action = action(PhiroMotorMoveForwardAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSpeed(speed);
 		return action;
@@ -530,7 +566,7 @@ public Action createPhiroMotorMoveBackwardActionAction(Sprite sprite, SequenceAc
 			PhiroMotorMoveBackwardBrick.Motor motorEnum, Formula speed) {
 		PhiroMotorMoveBackwardAction action = action(PhiroMotorMoveBackwardAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSpeed(speed);
 		return action;
@@ -539,7 +575,7 @@ public Action createPhiroMotorMoveBackwardActionAction(Sprite sprite, SequenceAc
 	public Action createPhiroRgbLedEyeActionAction(Sprite sprite, SequenceAction sequence,
 			PhiroRGBLightBrick.Eye eye, Formula red, Formula green, Formula blue) {
 		PhiroRGBLightAction action = action(PhiroRGBLightAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setEyeEnum(eye);
 		action.setRed(red);
@@ -551,7 +587,7 @@ public Action createPhiroRgbLedEyeActionAction(Sprite sprite, SequenceAction seq
 	public Action createPhiroSendSelectedSensorAction(Sprite sprite, SequenceAction sequence,
 			int sensorNumber, Action ifAction, Action elseAction) {
 		PhiroSensorAction action = action(PhiroSensorAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSensor(sensorNumber);
 		action.setIfAction(ifAction);
@@ -567,7 +603,7 @@ public Action createPhiroMotorStopActionAction(PhiroMotorStopBrick.Motor motorEn
 
 	public Action createMoveNStepsAction(Sprite sprite, SequenceAction sequence, Formula steps) {
 		MoveNStepsAction action = Actions.action(MoveNStepsAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSteps(steps);
 		return action;
@@ -609,7 +645,6 @@ public Action createStopEngraveAction(Sprite sprite) {
 		return action;
 	}
 
-
 	public Action createStartCutAction(Sprite sprite) {
 		StartCutAction action = Actions.action(StartCutAction.class);
 		action.setSprite(sprite);
@@ -626,7 +661,7 @@ public Action createArcAction(Sprite sprite, SequenceAction sequence,
 			ArcBrick.Directions direction,
 			Formula radius, Formula degrees) {
 		ArcAction action = Actions.action(ArcAction.class);
-		action.setScope(new Scope(ProjectManager.getInstance().getCurrentProject(), sprite,
+		action.setScope(new Scope(get(ProjectManager.class).getCurrentProject(), sprite,
 				sequence));
 		action.setDirection(direction);
 		action.setRadius(radius);
@@ -641,7 +676,7 @@ public Action createArcAction(Sprite sprite, SequenceAction sequence,
 	public Action createGoThroughAction(Sprite sprite, SequenceAction sequence,
 			Formula x1, Formula y1, Formula x2, Formula y2) {
 		GoThroughAction action = Actions.action(GoThroughAction.class);
-		action.setScope(new Scope(ProjectManager.getInstance().getCurrentProject(), sprite,
+		action.setScope(new Scope(get(ProjectManager.class).getCurrentProject(), sprite,
 				sequence));
 		action.setTargetCoordinates(x1, y1, x2, y2);
 
@@ -653,7 +688,7 @@ public Action createGoThroughAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createSetPenSizeAction(Sprite sprite, SequenceAction sequence, Formula penSize) {
 		SetPenSizeAction action = Actions.action(SetPenSizeAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPenSize(penSize);
 		return action;
@@ -662,7 +697,7 @@ public Action createSetPenSizeAction(Sprite sprite, SequenceAction sequence, For
 	public Action createSetPenColorAction(Sprite sprite, SequenceAction sequence, Formula red,
 			Formula green, Formula blue) {
 		SetPenColorAction action = Actions.action(SetPenColorAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setRed(red);
 		action.setGreen(green);
@@ -677,7 +712,7 @@ public Action createClearBackgroundAction() {
 	public Action createSetCameraFocusPointAction(Sprite sprite, SequenceAction sequence,
 			Formula horizontal, Formula vertical) {
 		SetCameraFocusPointAction action = action(SetCameraFocusPointAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSprite(sprite);
 		action.setHorizontal(horizontal);
@@ -707,7 +742,7 @@ public Action createStopSoundAction(Sprite sprite, SoundInfo sound) {
 
 	public Action createPointInDirectionAction(Sprite sprite, SequenceAction sequence, Formula degrees) {
 		PointInDirectionAction action = Actions.action(PointInDirectionAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegreesInUserInterfaceDimensionUnit(degrees);
 		return action;
@@ -734,7 +769,7 @@ public Action createDeleteThisCloneAction(Sprite sprite) {
 
 	public Action createSetBrightnessAction(Sprite sprite, SequenceAction sequence, Formula brightness) {
 		SetBrightnessAction action = Actions.action(SetBrightnessAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setBrightness(brightness);
 		return action;
@@ -742,7 +777,7 @@ public Action createSetBrightnessAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createSetColorAction(Sprite sprite, SequenceAction sequence, Formula color) {
 		SetColorAction action = Actions.action(SetColorAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setColor(color);
 		return action;
@@ -751,7 +786,7 @@ public Action createSetColorAction(Sprite sprite, SequenceAction sequence, Formu
 	public Action createSetTransparencyAction(Sprite sprite, SequenceAction sequence,
 			Formula transparency) {
 		SetTransparencyAction action = Actions.action(SetTransparencyAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setTransparency(transparency);
 		return action;
@@ -772,7 +807,8 @@ public Action createSetLookAction(Sprite sprite, LookData lookData, boolean wait
 	public Action createSetLookByIndexAction(Sprite sprite, SequenceAction sequence, Formula formula) {
 		SetLookByIndexAction action = Actions.action(SetLookByIndexAction.class);
 		action.setSprite(sprite);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite,
+				sequence);
 		action.setScope(scope);
 		action.setFormula(formula);
 		return action;
@@ -780,7 +816,7 @@ public Action createSetLookByIndexAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createSetBackgroundAction(LookData lookData, boolean wait) {
 		SetLookAction action = Actions.action(SetLookAction.class);
-		action.setSprite(ProjectManager.getInstance().getCurrentlyPlayingScene().getBackgroundSprite());
+		action.setSprite(get(ProjectManager.class).getCurrentlyPlayingScene().getBackgroundSprite());
 		action.setLookData(lookData);
 		action.setWait(wait);
 		return action;
@@ -789,8 +825,8 @@ public Action createSetBackgroundAction(LookData lookData, boolean wait) {
 	public Action createSetBackgroundByIndexAction(Sprite sprite, SequenceAction sequence,
 			Formula formula, boolean wait) {
 		SetLookByIndexAction action = Actions.action(SetLookByIndexAction.class);
-		action.setSprite(ProjectManager.getInstance().getCurrentlyPlayingScene().getBackgroundSprite());
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		action.setSprite(get(ProjectManager.class).getCurrentlyPlayingScene().getBackgroundSprite());
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(formula);
 		action.setWait(wait);
@@ -800,7 +836,7 @@ public Action createSetBackgroundByIndexAction(Sprite sprite, SequenceAction seq
 	public Action createSetNextLookAction(Sprite sprite, SequenceAction sequence) {
 		SetNextLookAction action = Actions.action(SetNextLookAction.class);
 		action.setSprite(sprite);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -808,7 +844,7 @@ public Action createSetNextLookAction(Sprite sprite, SequenceAction sequence) {
 	public Action createSetPreviousLookAction(Sprite sprite, SequenceAction sequence) {
 		SetPreviousLookAction action = action(SetPreviousLookAction.class);
 		action.setSprite(sprite);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -821,7 +857,7 @@ public Action createDeleteLookAction(Sprite sprite) {
 
 	public Action createSetSizeToAction(Sprite sprite, SequenceAction sequence, Formula size) {
 		SetSizeToAction action = Actions.action(SetSizeToAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSize(size);
 		return action;
@@ -832,7 +868,7 @@ public Action createGlideToPhysicsAction(Sprite sprite, PhysicsLook physicsLook,
 			Formula y, float duration, float delta) {
 
 		GlideToPhysicsAction action = Actions.action(GlideToPhysicsAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPhysicsLook(physicsLook);
 		action.setPosition(x, y);
@@ -844,14 +880,14 @@ public Action createGlideToPhysicsAction(Sprite sprite, PhysicsLook physicsLook,
 	public Action createSetVolumeToAction(Sprite sprite, SequenceAction sequence, Formula volume) {
 		SetVolumeToAction action = Actions.action(SetVolumeToAction.class);
 		action.setVolume(volume);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
 
 	public Action createSetXAction(Sprite sprite, SequenceAction sequence, Formula x) {
 		SetXAction action = Actions.action(SetXAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setX(x);
 		return action;
@@ -859,7 +895,7 @@ public Action createSetXAction(Sprite sprite, SequenceAction sequence, Formula x
 
 	public Action createSetYAction(Sprite sprite, SequenceAction sequence, Formula y) {
 		SetYAction action = Actions.action(SetYAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setY(y);
 		return action;
@@ -874,7 +910,7 @@ public Action createShowAction(Sprite sprite) {
 
 	public Action createSpeakAction(Sprite sprite, SequenceAction sequence, Formula text) {
 		SpeakAction action = action(SpeakAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setSpeechSynthesizer(new SpeechSynthesizer(scope, text));
 		action.setMobileServiceAvailability(get(MobileServiceAvailability.class));
 		action.setContext(StageActivity.activeStageActivity.get());
@@ -884,7 +920,7 @@ public Action createSpeakAction(Sprite sprite, SequenceAction sequence, Formula
 
 	public Action createSpeakAndWaitAction(Sprite sprite, SequenceAction sequence, Formula text) {
 		SpeakAndWaitAction action = action(SpeakAndWaitAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setSpeechSynthesizer(new SpeechSynthesizer(scope, text));
 		action.setMobileServiceAvailability(get(MobileServiceAvailability.class));
 		action.setContext(StageActivity.activeStageActivity.get());
@@ -897,7 +933,7 @@ public Action createStopAllSoundsAction() {
 
 	public Action createPauseForBeatsAction(Sprite sprite, SequenceAction sequence, Formula beats) {
 		PauseForBeatsAction action = action(PauseForBeatsAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setBeats(beats);
 		return action;
@@ -906,7 +942,7 @@ public Action createPauseForBeatsAction(Sprite sprite, SequenceAction sequence,
 	public Action createPlayNoteForBeatsAction(Sprite sprite, SequenceAction sequence, Formula note,
 			Formula beats) {
 		PlayNoteForBeatsAction action = action(PlayNoteForBeatsAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setMidiValue(note);
 		action.setBeats(beats);
@@ -921,7 +957,7 @@ public Action createSetInstrumentAction(PickableMusicalInstrument instrument) {
 
 	public Action createSetTempoAction(Sprite sprite, SequenceAction sequence, Formula tempo) {
 		SetTempoAction action = action(SetTempoAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setTempo(tempo);
 		return action;
@@ -929,7 +965,7 @@ public Action createSetTempoAction(Sprite sprite, SequenceAction sequence, Formu
 
 	public Action createChangeTempoAction(Sprite sprite, SequenceAction sequence, Formula tempo) {
 		ChangeTempoByAction action = action(ChangeTempoByAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setTempo(tempo);
 		return action;
@@ -938,7 +974,7 @@ public Action createChangeTempoAction(Sprite sprite, SequenceAction sequence, Fo
 	public Action createPlayDrumForBeatsAction(Sprite sprite, SequenceAction sequence, Formula beats,
 			PickableDrum drum) {
 		PlayDrumForBeatsAction action = action(PlayDrumForBeatsAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setBeats(beats);
 		action.setDrum(drum);
@@ -947,7 +983,7 @@ public Action createPlayDrumForBeatsAction(Sprite sprite, SequenceAction sequenc
 
 	public Action createTurnLeftAction(Sprite sprite, SequenceAction sequence, Formula degrees) {
 		TurnLeftAction action = Actions.action(TurnLeftAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegrees(degrees);
 		return action;
@@ -955,7 +991,7 @@ public Action createTurnLeftAction(Sprite sprite, SequenceAction sequence, Formu
 
 	public Action createTurnRightAction(Sprite sprite, SequenceAction sequence, Formula degrees) {
 		TurnRightAction action = Actions.action(TurnRightAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegrees(degrees);
 		return action;
@@ -963,7 +999,7 @@ public Action createTurnRightAction(Sprite sprite, SequenceAction sequence, Form
 
 	public Action createChangeVariableAction(Sprite sprite, SequenceAction sequence, Formula variableFormula, UserVariable userVariable) {
 		ChangeVariableAction action = Actions.action(ChangeVariableAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setChangeVariable(variableFormula);
 		action.setUserVariable(userVariable);
@@ -973,7 +1009,7 @@ public Action createChangeVariableAction(Sprite sprite, SequenceAction sequence,
 	public Action createSetVariableAction(Sprite sprite, SequenceAction sequence, Formula variableFormula,
 			UserVariable userVariable) {
 		SetVariableAction action = Actions.action(SetVariableAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setChangeVariable(variableFormula);
 		action.setUserVariable(userVariable);
@@ -983,7 +1019,7 @@ public Action createSetVariableAction(Sprite sprite, SequenceAction sequence, Fo
 	public Action createAskAction(Sprite sprite, SequenceAction sequence, Formula questionFormula,
 			UserVariable answerVariable) {
 		AskAction action = Actions.action(AskAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setQuestionFormula(questionFormula);
 		action.setAnswerVariable(answerVariable);
@@ -993,7 +1029,7 @@ public Action createAskAction(Sprite sprite, SequenceAction sequence, Formula qu
 	public Action createAskSpeechAction(Sprite sprite, SequenceAction sequence, Formula questionFormula,
 			UserVariable answerVariable) {
 		AskSpeechAction action = Actions.action(AskSpeechAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setQuestionFormula(questionFormula);
 		action.setAnswerVariable(answerVariable);
@@ -1003,7 +1039,7 @@ public Action createAskSpeechAction(Sprite sprite, SequenceAction sequence, Form
 	public Action createDeleteItemOfUserListAction(Sprite sprite, SequenceAction sequence,
 			Formula userListFormula, UserList userList) {
 		DeleteItemOfUserListAction action = action(DeleteItemOfUserListAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaIndexToDelete(userListFormula);
 		action.setUserList(userList);
@@ -1019,7 +1055,7 @@ public Action createClearUserListAction(UserList userList) {
 	public Action createAddItemToUserListAction(Sprite sprite, SequenceAction sequence,
 			Formula userListFormula, UserList userList) {
 		AddItemToUserListAction action = action(AddItemToUserListAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaItemToAdd(userListFormula);
 		action.setUserList(userList);
@@ -1030,7 +1066,7 @@ public Action createInsertItemIntoUserListAction(Sprite sprite, SequenceAction s
 			Formula userListFormulaIndexToInsert,
 			Formula userListFormulaItemToInsert, UserList userList) {
 		InsertItemIntoUserListAction action = action(InsertItemIntoUserListAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaIndexToInsert(userListFormulaIndexToInsert);
 		action.setFormulaItemToInsert(userListFormulaItemToInsert);
@@ -1041,7 +1077,7 @@ public Action createInsertItemIntoUserListAction(Sprite sprite, SequenceAction s
 	public Action createStoreCSVIntoUserListAction(Sprite sprite, SequenceAction sequence,
 			Formula userListFormulaColumn, Formula userListFormulaCSV, UserList userList) {
 		StoreCSVIntoUserListAction action = action(StoreCSVIntoUserListAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaColumnToExtract(userListFormulaColumn);
 		action.setFormulaCSVData(userListFormulaCSV);
@@ -1053,7 +1089,7 @@ public Action createReplaceItemInUserListAction(Sprite sprite, SequenceAction se
 			Formula userListFormulaIndexToReplace,
 			Formula userListFormulaItemToInsert, UserList userList) {
 		ReplaceItemInUserListAction action = action(ReplaceItemInUserListAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaIndexToReplace(userListFormulaIndexToReplace);
 		action.setFormulaItemToInsert(userListFormulaItemToInsert);
@@ -1069,7 +1105,7 @@ public Action createThinkSayBubbleAction(Sprite sprite, SequenceAction sequence,
 			AndroidStringProvider androidStringProvider, Formula text, int type) {
 		ThinkSayBubbleAction action = action(ThinkSayBubbleAction.class);
 		action.setText(text);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setAndroidStringProvider(androidStringProvider);
 		action.setType(type);
@@ -1080,7 +1116,7 @@ public Action createThinkSayForBubbleAction(Sprite sprite, SequenceAction sequen
 			AndroidStringProvider androidStringProvider, Formula text, int type) {
 		ThinkSayBubbleAction action = action(ThinkSayBubbleAction.class);
 		action.setText(text);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setAndroidStringProvider(androidStringProvider);
 		action.setType(type);
@@ -1107,7 +1143,7 @@ public Action createIfLogicAction(Sprite sprite, SequenceAction sequence, Formul
 		action.setIfAction(ifAction);
 		action.setIfCondition(condition);
 		action.setElseAction(elseAction);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -1117,7 +1153,7 @@ public Action createRepeatAction(Sprite sprite, SequenceAction sequence, Formula
 		RepeatAction action = Actions.action(RepeatAction.class);
 		action.setRepeatCount(count);
 		action.setAction(repeatedAction);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLoopDelay(isLoopDelay);
 		return action;
@@ -1130,7 +1166,7 @@ public Action createForVariableFromToAction(Sprite sprite,
 		action.setRange(from, to);
 		action.setControlVariable(controlVariable);
 		action.setAction(repeatedAction);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLoopDelay(isLoopDelay);
 		return action;
@@ -1148,7 +1184,7 @@ public Action createForItemInUserListAction(UserList userList,
 
 	public Action createWaitUntilAction(Sprite sprite, SequenceAction sequence, Formula condition) {
 		WaitUntilAction action = Actions.action(WaitUntilAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setCondition(condition);
 		return action;
@@ -1159,7 +1195,7 @@ public Action createRepeatUntilAction(Sprite sprite, SequenceAction sequence, Fo
 		RepeatUntilAction action = action(RepeatUntilAction.class);
 		action.setRepeatCondition(condition);
 		action.setAction(repeatedAction);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLoopDelay(isLoopDelay);
 		return action;
@@ -1167,7 +1203,7 @@ public Action createRepeatUntilAction(Sprite sprite, SequenceAction sequence, Fo
 
 	public Action createDelayAction(Sprite sprite, SequenceAction sequence, Formula delay) {
 		WaitAction action = Actions.action(WaitAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDelay(delay);
 		return action;
@@ -1178,7 +1214,7 @@ public Action createForeverAction(Sprite sprite, SequenceAction sequence, Script
 		RepeatAction action = Actions.action(RepeatAction.class);
 		action.setForeverRepeat(true);
 		action.setAction(foreverSequence);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLoopDelay(isLoopDelay);
 		return action;
@@ -1192,7 +1228,7 @@ public static Action createStitchAction(Sprite sprite) {
 
 	public Action createRunningStitchAction(Sprite sprite, SequenceAction sequence, Formula length) {
 		RunningStitchAction action = Actions.action(RunningStitchAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLength(length);
 		return action;
@@ -1200,7 +1236,7 @@ public Action createRunningStitchAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createTripleStitchAction(Sprite sprite, SequenceAction sequence, Formula steps) {
 		TripleStitchAction action = Actions.action(TripleStitchAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSteps(steps);
 		return action;
@@ -1209,7 +1245,7 @@ public Action createTripleStitchAction(Sprite sprite, SequenceAction sequence, F
 	public Action createZigZagStitchAction(Sprite sprite, SequenceAction sequence, Formula length,
 			Formula width) {
 		ZigZagStitchAction action = Actions.action(ZigZagStitchAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLength(length);
 		action.setWidth(width);
@@ -1225,38 +1261,40 @@ public static Action createStopRunningStitchAction(Sprite sprite) {
 	public Action createWriteEmbroideryToFileAction(Sprite sprite, SequenceAction sequence,
 			Formula fileName) {
 		WriteEmbroideryToFileAction action = Actions.action(WriteEmbroideryToFileAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 
 		return action;
 	}
 
-	public Action createSavePlotAction(Sprite sprite, SequenceAction sequence, Formula fileName){
+	public Action createSavePlotAction(Sprite sprite, SequenceAction sequence, Formula fileName) {
 		SavePlotAction action = Actions.action(SavePlotAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 		return action;
 	}
-	public Action createSaveLaserAction(Sprite sprite, SequenceAction sequence, Formula fileName){
+
+	public Action createSaveLaserAction(Sprite sprite, SequenceAction sequence, Formula fileName) {
 		SaveLaserAction action = Actions.action(SaveLaserAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 		return action;
 	}
 
-	public Action createSharePlotAction(Sprite sprite, SequenceAction sequence, Formula fileName){
+	public Action createSharePlotAction(Sprite sprite, SequenceAction sequence, Formula fileName) {
 		SharePlotAction action = Actions.action(SharePlotAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 		return action;
 	}
-	public Action createShareLaserAction(Sprite sprite, SequenceAction sequence, Formula fileName){
+
+	public Action createShareLaserAction(Sprite sprite, SequenceAction sequence, Formula fileName) {
 		ShareLaserAction action = Actions.action(ShareLaserAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 		return action;
@@ -1270,7 +1308,7 @@ public Action createSewUpAction(Sprite sprite) {
 
 	public Action createSetThreadColorAction(Sprite sprite, SequenceAction sequence, Formula color) {
 		SetThreadColorAction action = Actions.action(SetThreadColorAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setSprite(sprite);
 		action.setScope(scope);
 		action.setColor(color);
@@ -1325,7 +1363,7 @@ public Action createSetTextAction(Sprite sprite, SequenceAction sequence, Formul
 		action.setPosition(x, y);
 		action.setText(text);
 		action.setDuration(5);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -1335,7 +1373,7 @@ public Action createShowVariableAction(Sprite sprite, SequenceAction sequence, F
 		ShowTextAction action = action(ShowTextAction.class);
 		action.setPosition(xPosition, yPosition);
 		action.setVariableToShow(userVariable);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setAndroidStringProvider(androidStringProvider);
 		return action;
@@ -1349,7 +1387,7 @@ public Action createShowVariableColorAndSizeAction(Sprite sprite, SequenceAction
 		action.setRelativeTextSize(relativeTextSize);
 		action.setColor(color);
 		action.setVariableToShow(userVariable);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setAlignment(alignment);
 		action.setAndroidStringProvider(androidStringProvider);
@@ -1373,7 +1411,7 @@ public Action createFlashAction(boolean flashOn) {
 
 	public Action createVibrateAction(Sprite sprite, SequenceAction sequence, Formula duration) {
 		VibrateAction action = action(VibrateAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDuration(duration);
 		return action;
@@ -1389,7 +1427,7 @@ public Action createFadeParticleEffectsAction(Sprite sprite, boolean turnOn) {
 		FadeParticleEffectAction action = action(FadeParticleEffectAction.class);
 		action.setFadeIn(turnOn);
 		action.setSprite(sprite);
-		action.setBackgroundSprite(ProjectManager.getInstance().getCurrentlyPlayingScene().getBackgroundSprite());
+		action.setBackgroundSprite(get(ProjectManager.class).getCurrentlyPlayingScene().getBackgroundSprite());
 		return action;
 	}
 
@@ -1403,7 +1441,7 @@ public Action createAdditiveParticleEffectsAction(Sprite sprite, boolean turnOn)
 	public Action createSetParticleColorAction(Sprite sprite, Formula color, SequenceAction sequence) {
 		SetParticleColorAction action = action(SetParticleColorAction.class);
 		action.setColor(color);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -1423,7 +1461,7 @@ public Action createSetBackCameraAction() {
 	public Action createSendDigitalArduinoValueAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Formula pinValue) {
 		ArduinoSendDigitalValueAction action = action(ArduinoSendDigitalValueAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumber(pinNumber);
 		action.setPinValue(pinValue);
@@ -1433,7 +1471,7 @@ public Action createSendDigitalArduinoValueAction(Sprite sprite, SequenceAction
 	public Action createSendPWMArduinoValueAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Formula pinValue) {
 		ArduinoSendPWMValueAction action = action(ArduinoSendPWMValueAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumber(pinNumber);
 		action.setPinValue(pinValue);
@@ -1443,7 +1481,7 @@ public Action createSendPWMArduinoValueAction(Sprite sprite, SequenceAction sequ
 	public Action createSendDigitalRaspiValueAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Formula pinValue) {
 		RaspiSendDigitalValueAction action = action(RaspiSendDigitalValueAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumber(pinNumber);
 		action.setPinValue(pinValue);
@@ -1453,7 +1491,7 @@ public Action createSendDigitalRaspiValueAction(Sprite sprite, SequenceAction se
 	public Action createSendRaspiPwmValueAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Formula pwmFrequency, Formula pwmPercentage) {
 		RaspiPwmAction action = action(RaspiPwmAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumberFormula(pinNumber);
 		action.setPwmFrequencyFormula(pwmFrequency);
@@ -1464,7 +1502,7 @@ public Action createSendRaspiPwmValueAction(Sprite sprite, SequenceAction sequen
 	public Action createRaspiIfLogicActionAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Action ifAction, Action elseAction) {
 		RaspiIfLogicAction action = action(RaspiIfLogicAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumber(pinNumber);
 		action.setIfAction(ifAction);
@@ -1488,10 +1526,11 @@ public Action createStopScriptAction(int spinnerSelection, Script currentScript,
 		}
 	}
 
-	public Action createReportAction(Sprite sprite, SequenceAction sequence, Script currentScript, Formula reportFormula) {
+	public Action createReportAction(Sprite sprite, SequenceAction sequence, Script currentScript,
+			Formula reportFormula) {
 		if (currentScript instanceof UserDefinedScript) {
 			ReportAction reportAction = Actions.action(ReportAction.class);
-			Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+			Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 			reportAction.setScope(scope);
 			reportAction.setCurrentScript(currentScript);
 			reportAction.setReportFormula(reportFormula);
@@ -1505,7 +1544,7 @@ public Action createReportAction(Sprite sprite, SequenceAction sequence, Script
 
 	public Action createSetNfcTagAction(Sprite sprite, SequenceAction sequence, Formula nfcNdefMessage, int nfcNdefSpinnerSelection) {
 		SetNfcTagAction setNfcTagAction = Actions.action(SetNfcTagAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		setNfcTagAction.setScope(scope);
 		setNfcTagAction.setNfcTagNdefSpinnerSelection(nfcNdefSpinnerSelection);
 		setNfcTagAction.setNfcNdefMessage(nfcNdefMessage);
@@ -1519,7 +1558,7 @@ public Action createAssertEqualsAction(Sprite sprite, SequenceAction sequence, F
 		action.setActualFormula(actual);
 		action.setExpectedFormula(expected);
 
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPosition(position);
 
@@ -1532,7 +1571,7 @@ public Action createAssertUserListsAction(Sprite sprite, SequenceAction sequence
 		action.setActualUserList(actual);
 		action.setExpectedUserList(expected);
 
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPosition(position);
 
@@ -1561,7 +1600,7 @@ public Action createParameterizedAssertAction(Sprite sprite, SequenceAction sequ
 		action.setExpectedList(expected);
 		action.setParameterizedData(data);
 
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPosition(position);
 
@@ -1576,7 +1615,7 @@ public Action createFinishStageAction(boolean silent) {
 
 	public Action createTapAtAction(Sprite sprite, SequenceAction sequence, Formula x, Formula y) {
 		TapAtAction action = Actions.action(TapAtAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setStartX(x);
 		action.setStartY(y);
@@ -1586,7 +1625,7 @@ public Action createTapAtAction(Sprite sprite, SequenceAction sequence, Formula
 	public Action createTapForAction(Sprite sprite, SequenceAction sequence, Formula x, Formula y,
 			Formula duration) {
 		TapAtAction action = Actions.action(TapAtAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationFormula(duration);
 		action.setStartX(x);
@@ -1597,7 +1636,7 @@ public Action createTapForAction(Sprite sprite, SequenceAction sequence, Formula
 	public Action createTouchAndSlideAction(Sprite sprite, SequenceAction sequence, Formula x, Formula y,
 			Formula xChange, Formula yChange, Formula duration) {
 		TapAtAction action = Actions.action(TapAtAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationFormula(duration);
 		action.setStartX(x);
@@ -1609,7 +1648,7 @@ public Action createTouchAndSlideAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createWriteVariableOnDeviceAction(UserVariable userVariable) {
 		WriteUserDataOnDeviceAction action = Actions.action(WriteUserDataOnDeviceAction.class);
-		File projectDirectory = ProjectManager.getInstance().getCurrentProject().getDirectory();
+		File projectDirectory = get(ProjectManager.class).getCurrentProject().getDirectory();
 		DeviceVariableAccessor accessor = new DeviceVariableAccessor(projectDirectory);
 		action.setUserData(userVariable);
 		action.setAccessor(accessor);
@@ -1620,7 +1659,7 @@ public Action createWriteVariableOnDeviceAction(UserVariable userVariable) {
 	public Action createWriteVariableToFileAction(Sprite sprite, SequenceAction sequence,
 			Formula variableFormula, UserVariable userVariable) {
 		WriteVariableToFileAction action = Actions.action(WriteVariableToFileAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setUserVariable(userVariable);
 		action.setFormula(variableFormula);
@@ -1631,7 +1670,7 @@ public Action createWriteVariableToFileAction(Sprite sprite, SequenceAction sequ
 	public Action createReadVariableFromFileAction(Sprite sprite, SequenceAction sequence, Formula variableFormula,
 			UserVariable userVariable, boolean deleteFile) {
 		ReadVariableFromFileAction action = Actions.action(ReadVariableFromFileAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setUserVariable(userVariable);
 		action.setFormula(variableFormula);
@@ -1642,7 +1681,7 @@ public Action createReadVariableFromFileAction(Sprite sprite, SequenceAction seq
 
 	public Action createWriteListOnDeviceAction(UserList userList) {
 		WriteUserDataOnDeviceAction action = Actions.action(WriteUserDataOnDeviceAction.class);
-		File projectDirectory = ProjectManager.getInstance().getCurrentProject().getDirectory();
+		File projectDirectory = get(ProjectManager.class).getCurrentProject().getDirectory();
 		DeviceUserDataAccessor accessor = new DeviceListAccessor(projectDirectory);
 		UserData data = userList;
 		action.setUserData(data);
@@ -1672,7 +1711,7 @@ public Action createReadListFromDeviceAction(UserList userList) {
 	public Action createWebRequestAction(Sprite sprite, SequenceAction sequence, Formula variableFormula,
 			UserVariable userVariable) {
 		WebRequestAction action = action(WebRequestAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		action.setUserVariable(userVariable);
@@ -1682,7 +1721,7 @@ public Action createWebRequestAction(Sprite sprite, SequenceAction sequence, For
 	public Action createLookRequestAction(Sprite sprite, SequenceAction sequence,
 			Formula variableFormula) {
 		LookRequestAction action = action(LookRequestAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		return action;
@@ -1690,7 +1729,7 @@ public Action createLookRequestAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createOpenUrlAction(Sprite sprite, SequenceAction sequence, Formula variableFormula) {
 		OpenUrlAction action = action(OpenUrlAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		return action;
@@ -1700,7 +1739,7 @@ public Action createStartListeningAction(UserVariable userVariable) {
 		// This is a fix to get the StartListeningBrick to work on Huawei Phones,
 		// can be changed once HMS is fully implemented and working
 		// As soon as this is the case, remove the if-statement and only use the else-branch
-		if (get(MobileServiceAvailability.class).isHmsAvailable(ProjectManager.getInstance().getApplicationContext())) {
+		if (get(MobileServiceAvailability.class).isHmsAvailable(get(ProjectManager.class).getApplicationContext())) {
 			AskSpeechAction action = Actions.action(AskSpeechAction.class);
 			action.setAnswerVariable(userVariable);
 			return action;
@@ -1720,7 +1759,7 @@ public Action createSetListeningLanguageAction(String listeningLanguageTag) {
 	public Action createPaintNewLookAction(Sprite sprite, SequenceAction sequence,
 			Formula variableFormula, SetNextLookAction nextLookAction) {
 		PaintNewLookAction action = action(PaintNewLookAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		action.nextLookAction(nextLookAction);
@@ -1730,7 +1769,7 @@ public Action createPaintNewLookAction(Sprite sprite, SequenceAction sequence,
 	public Action createCopyLookAction(Sprite sprite, SequenceAction sequence, Formula variableFormula,
 			SetNextLookAction nextLookAction) {
 		CopyLookAction action = action(CopyLookAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		action.nextLookAction(nextLookAction);
@@ -1740,7 +1779,7 @@ public Action createCopyLookAction(Sprite sprite, SequenceAction sequence, Formu
 	public Action createEditLookAction(Sprite sprite, SequenceAction sequence,
 			SetNextLookAction nextLookAction) {
 		EditLookAction action = action(EditLookAction.class);
-		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.nextLookAction(nextLookAction);
 		return action;
diff --git a/catroid/src/main/java/org/catrobat/catroid/content/Scope.kt b/catroid/src/main/java/org/catrobat/catroid/content/Scope.kt
index ca8f35a736b..12cb25e770d 100644
--- a/catroid/src/main/java/org/catrobat/catroid/content/Scope.kt
+++ b/catroid/src/main/java/org/catrobat/catroid/content/Scope.kt
@@ -27,6 +27,6 @@ import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction
 
 data class Scope(
     val project: Project?,
-    val sprite: Sprite,
+    var sprite: Sprite,
     val sequence: SequenceAction?
 )
diff --git a/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToOtherSpritePositionAction.kt b/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToOtherSpritePositionAction.kt
new file mode 100644
index 00000000000..2153e00f1fc
--- /dev/null
+++ b/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToOtherSpritePositionAction.kt
@@ -0,0 +1,64 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2025 The Catrobat Team
+ * (<http://developer.catrobat.org/credits>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * An additional term exception under section 7 of the GNU Affero
+ * General Public License, version 3, is available at
+ * http://developer.catrobat.org/license_additional_term
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.catrobat.catroid.content.actions
+
+import com.badlogic.gdx.scenes.scene2d.actions.TemporalAction
+import org.catrobat.catroid.content.Scope
+import org.catrobat.catroid.content.Sprite
+
+class GlideToOtherSpritePositionAction : TemporalAction() {
+    lateinit var scope: Scope
+    var destinationSprite: Sprite? = null
+    private var startXPosition: Float = 0f
+    private var startYPosition: Float = 0f
+    var destinationXPosition: Float = 0f
+    var destinationYPosition: Float = 0f
+    var currentXPosition: Float = 0f
+    var currentYPosition: Float = 0f
+
+
+    override fun begin() {
+        super.begin()
+        scope.sprite.isGliding = true
+        startXPosition = scope.sprite.look.xInUserInterfaceDimensionUnit
+        startYPosition = scope.sprite.look.yInUserInterfaceDimensionUnit
+    }
+
+    override fun act(delta: Float): Boolean {
+        return super.act(delta)
+
+    }
+    override fun update(percent: Float) {
+        val destinationLook = destinationSprite?.look?:return
+        destinationXPosition = destinationLook.xInUserInterfaceDimensionUnit
+        destinationYPosition = destinationLook.yInUserInterfaceDimensionUnit
+        currentXPosition = startXPosition + (destinationXPosition-startXPosition)*percent
+        currentYPosition = startYPosition + (destinationYPosition-startYPosition)*percent
+        scope.sprite.look?.setPositionInUserInterfaceDimensionUnit(currentXPosition,currentYPosition)
+    }
+    override fun end(){
+        super.end()
+        scope.sprite.isGliding = false
+    }
+
+}
diff --git a/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToRandomPositionAction.kt b/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToRandomPositionAction.kt
new file mode 100644
index 00000000000..00d051121c2
--- /dev/null
+++ b/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToRandomPositionAction.kt
@@ -0,0 +1,62 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2025 The Catrobat Team
+ * (<http://developer.catrobat.org/credits>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * An additional term exception under section 7 of the GNU Affero
+ * General Public License, version 3, is available at
+ * http://developer.catrobat.org/license_additional_term
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.catrobat.catroid.content.actions
+
+import com.badlogic.gdx.scenes.scene2d.actions.TemporalAction
+import org.catrobat.catroid.common.ScreenValues
+import org.catrobat.catroid.content.Scope
+
+
+class GlideToRandomPositionAction : TemporalAction() {
+    lateinit var scope: Scope
+    private var startXPosition: Float = 0f
+    private var startYPosition: Float = 0f
+    var randomXPosition: Float = 0f
+    var randomYPosition: Float = 0f
+    var currentXPosition: Float = 0f
+    var currentYPosition: Float = 0f
+
+
+    override fun begin() {
+        super.begin()
+        scope.sprite.isGliding = true
+        startXPosition = scope.sprite.look.xInUserInterfaceDimensionUnit
+        startYPosition = scope.sprite.look.yInUserInterfaceDimensionUnit
+        randomXPosition = Math.random().toFloat() * (ScreenValues.currentScreenResolution.width +
+            1) - (ScreenValues.currentScreenResolution.width / 2)
+        randomYPosition = Math.random().toFloat() * (ScreenValues.currentScreenResolution.height +
+            1) - (ScreenValues.currentScreenResolution.height / 2)
+    }
+
+    override fun update(percent: Float) {
+
+        currentXPosition = startXPosition + (randomXPosition-startXPosition)*percent
+        currentYPosition = startYPosition + (randomYPosition-startYPosition)*percent
+       scope.sprite.look?.setPositionInUserInterfaceDimensionUnit(currentXPosition,currentYPosition)
+    }
+    override fun end(){
+        super.end()
+        scope.sprite.isGliding = false
+    }
+
+}
diff --git a/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToTouchPositionAction.kt b/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToTouchPositionAction.kt
new file mode 100644
index 00000000000..ba35c15a189
--- /dev/null
+++ b/catroid/src/main/java/org/catrobat/catroid/content/actions/GlideToTouchPositionAction.kt
@@ -0,0 +1,70 @@
+/*
+* Catroid: An on-device visual programming system for Android devices
+* Copyright (C) 2010-2025 The Catrobat Team
+* (<http://developer.catrobat.org/credits>)
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* An additional term exception under section 7 of the GNU Affero
+* General Public License, version 3, is available at
+* http://developer.catrobat.org/license_additional_term
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+package org.catrobat.catroid.content.actions
+
+import com.badlogic.gdx.scenes.scene2d.actions.TemporalAction
+import org.catrobat.catroid.content.Scope
+import org.catrobat.catroid.utils.TouchUtil
+
+class GlideToTouchPositionAction : TemporalAction() {
+    lateinit var scope: Scope
+    private var startXPosition: Float = 0f
+    private var startYPosition: Float = 0f
+    var touchXPosition: Float = 0f
+    var touchYPosition: Float = 0f
+    var touchIndex: Int = 0
+    var currentXPosition: Float = 0f
+    var currentYPosition: Float = 0f
+    var touchFound = false
+
+    override fun begin() {
+        super.begin()
+        scope.sprite.isGliding = true
+        startXPosition = scope.sprite.look.xInUserInterfaceDimensionUnit
+        startYPosition = scope.sprite.look.yInUserInterfaceDimensionUnit
+    }
+
+    override fun act(delta: Float): Boolean {
+        if (!touchFound){
+            touchIndex = TouchUtil.getLastTouchIndex()
+            if(touchIndex > 0 && TouchUtil.isFingerTouching(touchIndex)){
+                touchFound = true
+                touchXPosition = TouchUtil.getX(touchIndex)
+                touchYPosition = TouchUtil.getY(touchIndex)
+                return super.act(delta)
+            }
+            return false
+        }
+        return super.act(delta)
+    }
+    override fun update(percent: Float) {
+
+        currentXPosition = startXPosition + (touchXPosition-startXPosition)*percent
+        currentYPosition = startYPosition + (touchYPosition-startYPosition)*percent
+        scope.sprite.look?.setPositionInUserInterfaceDimensionUnit(currentXPosition,currentYPosition)
+    }
+    override fun end(){
+        super.end()
+        scope.sprite.isGliding = false
+    }
+}
diff --git a/catroid/src/main/java/org/catrobat/catroid/content/bricks/GlideToPositionBrick.kt b/catroid/src/main/java/org/catrobat/catroid/content/bricks/GlideToPositionBrick.kt
new file mode 100644
index 00000000000..825d27734f9
--- /dev/null
+++ b/catroid/src/main/java/org/catrobat/catroid/content/bricks/GlideToPositionBrick.kt
@@ -0,0 +1,134 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2026 The Catrobat Team
+ * (<http://developer.catrobat.org/credits>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * An additional term exception under section 7 of the GNU Affero
+ * General Public License, version 3, is available at
+ * http://developer.catrobat.org/license_additional_term
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.catrobat.catroid.content.bricks
+
+import android.content.Context
+import android.view.View
+import org.catrobat.catroid.ProjectManager
+import org.catrobat.catroid.R
+import org.catrobat.catroid.common.BrickValues
+import org.catrobat.catroid.common.Nameable
+import org.catrobat.catroid.content.Sprite
+import org.catrobat.catroid.content.actions.ScriptSequenceAction
+import org.catrobat.catroid.content.bricks.Brick.BrickField
+import org.catrobat.catroid.content.bricks.brickspinner.BrickSpinner
+import org.catrobat.catroid.content.bricks.brickspinner.StringOption
+import org.catrobat.catroid.formulaeditor.Formula
+import org.koin.java.KoinJavaComponent
+
+class GlideToPositionBrick(var destinationSprite: Sprite? = null) : FormulaBrick(), BrickSpinner
+.OnItemSelectedListener<Sprite?> {
+    private var spinnerSelection: Int = 0
+
+    init {
+        addAllowedBrickField(
+            BrickField.DURATION_IN_SECONDS,
+            R.id.brick_glide_to_position_edit_text_duration
+
+        )
+    }
+
+    constructor(durationInMilliSecondsValue: Int) : this() {
+        val durationInSeconds = durationInMilliSecondsValue / 1000.0
+        setFormulaWithBrickField(BrickField.DURATION_IN_SECONDS, Formula(durationInSeconds))
+    }
+
+    override fun getViewResource(): Int {
+        return R.layout.brick_glide_to_position
+    }
+
+    override fun getDefaultBrickField(): BrickField {
+        return BrickField.DURATION_IN_SECONDS
+    }
+
+    override fun getView(context: Context?): View? {
+        super.getView(context)
+        val projectManager = KoinJavaComponent.get(ProjectManager::class.java)
+        setSecondsLabel(view, BrickField.DURATION_IN_SECONDS)
+        val items: MutableList<Nameable?> = ArrayList()
+        items.add(StringOption(context!!.getString(R.string.brick_glide_to_random_position)))
+        items.add(StringOption(context.getString(R.string.brick_glide_to_touch_position)))
+        items.addAll(projectManager.currentlyEditedScene.spriteList)
+        items.remove(projectManager.currentlyEditedScene.backgroundSprite)
+        items.remove(projectManager.currentSprite)
+        val spinner: BrickSpinner<Sprite?> = BrickSpinner<Sprite?>(
+            R.id
+                .brick_glide_to_position_spinner,
+            view, items
+        )
+        spinner.setOnItemSelectedListener(this)
+
+        if (spinnerSelection == BrickValues.GLIDE_TO_RANDOM_POSITION) {
+            spinner.setSelection(0)
+        }
+        if (spinnerSelection == BrickValues.GLIDE_TO_TOUCH_POSITION) {
+            spinner.setSelection(1)
+        }
+        if (spinnerSelection == BrickValues.GLIDE_TO_OTHER_SPRITE_POSITION) {
+            spinner.setSelection(destinationSprite)
+        }
+        return view
+    }
+
+    override fun onNewOptionSelected(spinnerId: Int?) {
+        //is needed
+    }
+
+    override fun onEditOptionSelected(spinnerId: Int?) {
+        //is needed
+    }
+
+    override fun onStringOptionSelected(spinnerId: Int?, string: String) {
+        val context = view.context
+
+        if (string == context.getString(R.string.brick_glide_to_touch_position)) {
+            spinnerSelection = BrickValues.GLIDE_TO_TOUCH_POSITION
+            destinationSprite = null
+        }
+
+        if (string == context.getString(R.string.brick_glide_to_random_position)) {
+            spinnerSelection = BrickValues.GLIDE_TO_RANDOM_POSITION
+            destinationSprite = null
+        }
+    }
+
+    override fun onItemSelected(spinnerId: Int?, item: Sprite?) {
+        spinnerSelection = BrickValues.GLIDE_TO_OTHER_SPRITE_POSITION
+        destinationSprite = item
+    }
+
+    override fun addActionToSequence(sprite: Sprite, sequence: ScriptSequenceAction) {
+        sequence.addAction(
+            sprite.actionFactory.createGlideToPositionAction(
+                sprite, destinationSprite, sequence,
+                getFormulaWithBrickField(BrickField.DURATION_IN_SECONDS), spinnerSelection
+            )
+        )
+    }
+
+    companion object {
+        @Suppress("unused")
+        private const val serialVersionUID = 1L
+    }
+}
diff --git a/catroid/src/main/java/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.kt b/catroid/src/main/java/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.kt
index 78424807e2f..f0d8ec13af9 100644
--- a/catroid/src/main/java/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.kt
+++ b/catroid/src/main/java/org/catrobat/catroid/ui/fragment/CategoryBricksFactory.kt
@@ -27,6 +27,7 @@ import org.catrobat.catroid.BuildConfig
 import org.catrobat.catroid.ProjectManager
 import org.catrobat.catroid.R
 import org.catrobat.catroid.common.BrickValues
+import org.catrobat.catroid.common.BrickValues.GLIDE_SECONDS
 import org.catrobat.catroid.content.BroadcastScript
 import org.catrobat.catroid.content.RaspiInterruptScript
 import org.catrobat.catroid.content.WhenBounceOffScript
@@ -87,6 +88,7 @@ import org.catrobat.catroid.content.bricks.ForItemInUserListBrick
 import org.catrobat.catroid.content.bricks.ForVariableFromToBrick
 import org.catrobat.catroid.content.bricks.ForeverBrick
 import org.catrobat.catroid.content.bricks.GlideToBrick
+import org.catrobat.catroid.content.bricks.GlideToPositionBrick
 import org.catrobat.catroid.content.bricks.GoNStepsBackBrick
 import org.catrobat.catroid.content.bricks.GoToBrick
 import org.catrobat.catroid.content.bricks.GoThroughBrick
@@ -477,9 +479,9 @@ open class CategoryBricksFactory {
             GlideToBrick(
                 BrickValues.X_POSITION,
                 BrickValues.Y_POSITION,
-                BrickValues.GLIDE_SECONDS
-            )
+                GLIDE_SECONDS)
         )
+        motionBrickList.add(GlideToPositionBrick(GLIDE_SECONDS))
         if (!isBackgroundSprite) {
             motionBrickList.add(GoNStepsBackBrick(BrickValues.GO_BACK))
             motionBrickList.add(ComeToFrontBrick())
diff --git a/catroid/src/main/res/layout/brick_glide_to_position.xml b/catroid/src/main/res/layout/brick_glide_to_position.xml
new file mode 100644
index 00000000000..b4d6807bce0
--- /dev/null
+++ b/catroid/src/main/res/layout/brick_glide_to_position.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Catroid: An on-device visual programming system for Android devices
+  ~ Copyright (C) 2010-2025 The Catrobat Team
+  ~ (<http://developer.catrobat.org/credits>)
+  ~
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU Affero General Public License as
+  ~ published by the Free Software Foundation, either version 3 of the
+  ~ License, or (at your option) any later version.
+  ~
+  ~ An additional term exception under section 7 of the GNU Affero
+  ~ General Public License, version 3, is available at
+  ~ http://developer.catrobat.org/license_additional_term
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  ~ GNU Affero General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Affero General Public License
+  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+
+    <CheckBox
+        android:id="@+id/brick_checkbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:visibility="gone" />
+
+    <org.catrobat.catroid.ui.BrickLayout
+        android:id="@+id/brick_glide_to_position_layout"
+        style="@style/BrickContainer.Motion.Medium">
+
+        <include layout="@layout/icon_brick_category_motion" />
+
+
+        <TextView
+            style="@style/BrickText.SingleLine"
+            android:text="@string/brick_glide" />
+
+        <TextView
+            android:id="@+id/brick_glide_to_position_edit_text_duration"
+            style="@style/BrickEditText"
+            android:layout_width="match_parent">
+        </TextView>
+
+        <TextView
+            android:id="@+id/brick_seconds_label"
+            style="@style/BrickText.SingleLine">
+        </TextView>
+
+        <TextView
+            android:id="@+id/brick_glide_to_position_label"
+            style="@style/BrickText.SingleLine"
+            android:text="@string/to_label">
+        </TextView>
+
+        <Spinner
+            android:id="@+id/brick_glide_to_position_spinner"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textDirection="locale" />
+
+    </org.catrobat.catroid.ui.BrickLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/catroid/src/main/res/values/strings.xml b/catroid/src/main/res/values/strings.xml
index fb9bc873e2d..85a58a44063 100644
--- a/catroid/src/main/res/values/strings.xml
+++ b/catroid/src/main/res/values/strings.xml
@@ -1007,6 +1007,8 @@
     <string formatted="false" name="brick_go_to">Go to</string>
     <string formatted="false" name="brick_go_to_touch_position">touch position</string>
     <string formatted="false" name="brick_go_to_random_position">random position</string>
+    <string formatted="false" name="brick_glide_to_touch_position">touch position</string>
+    <string formatted="false" name="brick_glide_to_random_position">random position</string>
     <!--  -->
 
     <!-- Physics -->
diff --git a/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToOtherSpritePositionActionTest.kt b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToOtherSpritePositionActionTest.kt
new file mode 100644
index 00000000000..b2bd9efefed
--- /dev/null
+++ b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToOtherSpritePositionActionTest.kt
@@ -0,0 +1,104 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2025 The Catrobat Team
+ * (<http://developer.catrobat.org/credits>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * An additional term exception under section 7 of the GNU Affero
+ * General Public License, version 3, is available at
+ * http://developer.catrobat.org/license_additional_term
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.catrobat.catroid.test.content.actions
+
+import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction
+import org.catrobat.catroid.ProjectManager
+import org.catrobat.catroid.common.BrickValues
+import org.catrobat.catroid.common.ScreenValues
+import org.catrobat.catroid.content.Project
+import org.catrobat.catroid.content.Scene
+import org.catrobat.catroid.content.Sprite
+import org.catrobat.catroid.content.actions.GlideToOtherSpritePositionAction
+import org.catrobat.catroid.formulaeditor.Formula
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class GlideToOtherSpritePositionActionTest {
+    private lateinit var sprite: Sprite
+    private lateinit var destinationSprite: Sprite
+    private lateinit var action: GlideToOtherSpritePositionAction
+
+    companion object {
+        private const val DESTINATION_X_POSITION = 150f
+        private const val DESTINATION_Y_POSITION = 300f
+    }
+
+    private lateinit var projectManager: ProjectManager
+
+    @Before
+    @Throws(Exception::class)
+    fun setUp() {
+        val mockContext = org.mockito.Mockito.mock(android.content.Context::class.java)
+        projectManager = ProjectManager(mockContext)
+        val project = Project()
+        projectManager.currentProject = project
+        val scene = Scene()
+        project.addScene(scene)
+        projectManager.currentlyPlayingScene = scene
+        sprite = Sprite("testSprite")
+        destinationSprite = Sprite("destinationSprite")
+        scene.addSprite(sprite)
+        scene.addSprite(destinationSprite)
+        ScreenValues.setToDefaultScreenSize()
+        action = sprite.actionFactory.createGlideToPositionAction(
+            sprite, destinationSprite,
+            SequenceAction(), Formula(2.0F), BrickValues.GLIDE_TO_OTHER_SPRITE_POSITION
+        ) as GlideToOtherSpritePositionAction
+    }
+
+    @Test
+    fun testGlideToOtherSpritePositionAction() {
+        destinationSprite.look.xInUserInterfaceDimensionUnit = DESTINATION_X_POSITION
+        destinationSprite.look.yInUserInterfaceDimensionUnit = DESTINATION_Y_POSITION
+        sprite.look.xInUserInterfaceDimensionUnit = 0f
+        sprite.look.yInUserInterfaceDimensionUnit = 0f
+        assertEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+        action.act(2f)
+        assertEquals(DESTINATION_X_POSITION, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(DESTINATION_Y_POSITION, sprite.look.yInUserInterfaceDimensionUnit)
+    }
+
+    @Test
+    fun testGlideToBehavior() {
+        destinationSprite.look.xInUserInterfaceDimensionUnit = DESTINATION_X_POSITION
+        destinationSprite.look.yInUserInterfaceDimensionUnit = DESTINATION_Y_POSITION
+        sprite.look.xInUserInterfaceDimensionUnit = 0f
+        sprite.look.yInUserInterfaceDimensionUnit = 0f
+        assertEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+        action.act(1f)
+        assertNotEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertNotEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+        assertNotEquals(DESTINATION_X_POSITION, sprite.look.xInUserInterfaceDimensionUnit)
+        assertNotEquals(DESTINATION_Y_POSITION, sprite.look.yInUserInterfaceDimensionUnit)
+        assertEquals(action.currentXPosition, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(action.currentYPosition, sprite.look.yInUserInterfaceDimensionUnit)
+    }
+}
diff --git a/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToRandomPositionActionTest.kt b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToRandomPositionActionTest.kt
new file mode 100644
index 00000000000..c362a650ade
--- /dev/null
+++ b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToRandomPositionActionTest.kt
@@ -0,0 +1,111 @@
+/*
+ * Catroid: An on-device visual programming system for Android devices
+ * Copyright (C) 2010-2026 The Catrobat Team
+ * (<http://developer.catrobat.org/credits>)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * An additional term exception under section 7 of the GNU Affero
+ * General Public License, version 3, is available at
+ * http://developer.catrobat.org/license_additional_term
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.catrobat.catroid.test.content.actions
+
+import android.widget.Spinner
+import com.badlogic.gdx.scenes.scene2d.actions.SequenceAction
+import org.catrobat.catroid.ProjectManager
+import org.catrobat.catroid.common.BrickValues
+import org.catrobat.catroid.common.ScreenValues
+import org.catrobat.catroid.content.Project
+import org.catrobat.catroid.content.Scene
+import org.catrobat.catroid.content.Sprite
+import org.catrobat.catroid.content.actions.GlideToRandomPositionAction
+import org.catrobat.catroid.formulaeditor.Formula
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotEquals
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+import org.koin.core.scope.Scope
+import org.koin.ext.scope
+
+import kotlin.getValue
+import kotlin.time.Duration
+import org.koin.java.KoinJavaComponent
+
+
+@RunWith(JUnit4::class)
+class GlideToRandomPositionActionTest {
+
+    private lateinit var sprite: Sprite
+    private lateinit var dummySprite: Sprite
+    private lateinit var action: GlideToRandomPositionAction
+    private lateinit var  projectManager: ProjectManager
+
+    @Before
+    @Throws(Exception::class)
+    fun SetUp() {
+        val mockContext = org.mockito.Mockito.mock(android.content.Context::class.java)
+        projectManager = ProjectManager(mockContext)
+        val project = Project()
+        projectManager.currentProject = project
+        val scene = Scene()
+        project.addScene(scene)
+        projectManager.currentlyPlayingScene = scene
+        sprite = Sprite("testSprite")
+        dummySprite = Sprite("dummySprite")
+        scene.addSprite(sprite)
+        ScreenValues.setToDefaultScreenSize()
+        action = sprite.actionFactory.createGlideToPositionAction(
+            sprite, dummySprite, SequenceAction(), Formula(2.0),
+            BrickValues.GLIDE_TO_RANDOM_POSITION
+        )
+            as GlideToRandomPositionAction
+    }
+
+    @Test
+    public fun testGlideToRandomPositionDestination() {
+
+        sprite.look.xInUserInterfaceDimensionUnit = 0f
+        sprite.look.yInUserInterfaceDimensionUnit = 0f
+
+        assertEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+
+        action.act(2.0F)
+
+        assertEquals(action.randomYPosition, sprite.look.yInUserInterfaceDimensionUnit)
+        assertEquals(action.randomXPosition, sprite.look.xInUserInterfaceDimensionUnit)
+    }
+
+    @Test
+    public fun testGlideToBehavior(){
+        sprite.look.xInUserInterfaceDimensionUnit = 0f
+        sprite.look.yInUserInterfaceDimensionUnit = 0f
+
+        assertEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+
+        action.act(1.0f)
+
+        assertNotEquals(0f, sprite.look.xInUserInterfaceDimensionUnit)
+        assertNotEquals(0f, sprite.look.yInUserInterfaceDimensionUnit)
+        assertNotEquals(action.randomXPosition, sprite.look.xInUserInterfaceDimensionUnit)
+        assertNotEquals(action.randomYPosition, sprite.look.yInUserInterfaceDimensionUnit)
+        assertEquals(action.currentXPosition, sprite.look.xInUserInterfaceDimensionUnit)
+        assertEquals(action.currentYPosition, sprite.look.yInUserInterfaceDimensionUnit)
+    }
+}
diff --git a/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GoToRandomPositionActionTest.kt b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GoToRandomPositionActionTest.kt
index 81f2477e121..e1de830b99e 100644
--- a/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GoToRandomPositionActionTest.kt
+++ b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GoToRandomPositionActionTest.kt
@@ -53,7 +53,7 @@ class GoToRandomPositionActionTest {
     }
 
     @Test
-    fun testGoToOtherSpriteAction() {
+    fun testGoToRandomPositionAction() {
         sprite.look.xInUserInterfaceDimensionUnit = 0f
         sprite.look.yInUserInterfaceDimensionUnit = 0f
 
diff --git a/gradle.properties b/gradle.properties
index c282ae38701..c861ba52052 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,3 +34,6 @@ android.enableJetifier=true
 org.gradle.caching=false
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
+
+# Enabled parallel sync for Gradle 9.4+
+org.gradle.tooling.parallel=true
diff --git a/settings.gradle b/settings.gradle
index 14507ac3c9b..88844359a41 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,6 @@
-/*
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
+}/*
  * Catroid: An on-device visual programming system for Android devices
  * Copyright (C) 2010-2025 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)

From d8b412ffd22201940dba37d9336a21124033559b Mon Sep 17 00:00:00 2001
From: rinaschedl <rinaschedl@gmx.at>
Date: Tue, 25 Aug 2026 10:11:54 +0200
Subject: [PATCH 2/7] Push new gradle-daemon vor JavaVersions

---
 gradle/gradle-daemon-jvm.properties | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 gradle/gradle-daemon-jvm.properties

diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties
new file mode 100644
index 00000000000..baa28d154c6
--- /dev/null
+++ b/gradle/gradle-daemon-jvm.properties
@@ -0,0 +1,13 @@
+#This file is generated by updateDaemonJvm
+toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
+toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
+toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
+toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
+toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7083b89563e7ce20943037b8cd2b8cc2/redirect
+toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/060bbb778a1f55ea705fdebd2ccfeab9/redirect
+toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/491f83666ae7f4d6ebb28fee72ebb035/redirect
+toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/0d1a1acdc708062093673f65aa9aba4b/redirect
+toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d09679dc60fe5aa05ef7d03efdefac20/redirect
+toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/ed4e3bf2f5e7c5d9aabc4cbd8acd555e/redirect
+toolchainVendor=JETBRAINS
+toolchainVersion=21

From a14b750c6c89a86649c6dd624e089d9430d00663 Mon Sep 17 00:00:00 2001
From: rinaschedl <rinaschedl@gmx.at>
Date: Tue, 1 Sep 2026 07:49:44 +0200
Subject: [PATCH 3/7] Integrated manuel start and stop of Koin in the tests,
 because the tests suddently failed and we do not have a koin base class

---
 .../GlideToOtherSpritePositionActionTest.kt   | 21 +++++++++++++++++
 .../GlideToRandomPositionActionTest.kt        | 23 +++++++++++++++++--
 gradle.properties                             |  2 +-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToOtherSpritePositionActionTest.kt b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToOtherSpritePositionActionTest.kt
index b2bd9efefed..e5548980e0d 100644
--- a/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToOtherSpritePositionActionTest.kt
+++ b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToOtherSpritePositionActionTest.kt
@@ -31,12 +31,16 @@ import org.catrobat.catroid.content.Scene
 import org.catrobat.catroid.content.Sprite
 import org.catrobat.catroid.content.actions.GlideToOtherSpritePositionAction
 import org.catrobat.catroid.formulaeditor.Formula
+import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
+import org.koin.dsl.module
 
 @RunWith(JUnit4::class)
 class GlideToOtherSpritePositionActionTest {
@@ -54,10 +58,22 @@ class GlideToOtherSpritePositionActionTest {
     @Before
     @Throws(Exception::class)
     fun setUp() {
+        stopKoin()
         val mockContext = org.mockito.Mockito.mock(android.content.Context::class.java)
         projectManager = ProjectManager(mockContext)
         val project = Project()
         projectManager.currentProject = project
+        startKoin {
+            modules(module {
+                single { projectManager }
+                single {
+                    org.mockito.Mockito.mock(
+                        org.catrobat.catroid.utils
+                            .MobileServiceAvailability::class.java
+                    )
+                }
+            })
+        }
         val scene = Scene()
         project.addScene(scene)
         projectManager.currentlyPlayingScene = scene
@@ -72,6 +88,11 @@ class GlideToOtherSpritePositionActionTest {
         ) as GlideToOtherSpritePositionAction
     }
 
+    @After
+    fun tearDown(){
+        stopKoin()
+    }
+
     @Test
     fun testGlideToOtherSpritePositionAction() {
         destinationSprite.look.xInUserInterfaceDimensionUnit = DESTINATION_X_POSITION
diff --git a/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToRandomPositionActionTest.kt b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToRandomPositionActionTest.kt
index c362a650ade..29db746d188 100644
--- a/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToRandomPositionActionTest.kt
+++ b/catroid/src/test/java/org/catrobat/catroid/test/content/actions/GlideToRandomPositionActionTest.kt
@@ -33,13 +33,17 @@ import org.catrobat.catroid.content.Scene
 import org.catrobat.catroid.content.Sprite
 import org.catrobat.catroid.content.actions.GlideToRandomPositionAction
 import org.catrobat.catroid.formulaeditor.Formula
+import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotEquals
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
+import org.koin.core.context.startKoin
+import org.koin.core.context.stopKoin
 import org.koin.core.scope.Scope
+import org.koin.dsl.module
 import org.koin.ext.scope
 
 import kotlin.getValue
@@ -58,10 +62,21 @@ class GlideToRandomPositionActionTest {
     @Before
     @Throws(Exception::class)
     fun SetUp() {
+        stopKoin()
         val mockContext = org.mockito.Mockito.mock(android.content.Context::class.java)
         projectManager = ProjectManager(mockContext)
         val project = Project()
         projectManager.currentProject = project
+        startKoin {
+            modules(module {
+                single { projectManager }
+                single {
+                    org.mockito.Mockito.mock(
+                        org.catrobat.catroid.utils
+                            .MobileServiceAvailability::class.java
+                    )
+                }
+            })}
         val scene = Scene()
         project.addScene(scene)
         projectManager.currentlyPlayingScene = scene
@@ -75,9 +90,13 @@ class GlideToRandomPositionActionTest {
         )
             as GlideToRandomPositionAction
     }
+    @After
+    fun tearDown(){
+        stopKoin()
+    }
 
     @Test
-    public fun testGlideToRandomPositionDestination() {
+    fun testGlideToRandomPositionDestination() {
 
         sprite.look.xInUserInterfaceDimensionUnit = 0f
         sprite.look.yInUserInterfaceDimensionUnit = 0f
@@ -92,7 +111,7 @@ class GlideToRandomPositionActionTest {
     }
 
     @Test
-    public fun testGlideToBehavior(){
+    fun testGlideToBehavior(){
         sprite.look.xInUserInterfaceDimensionUnit = 0f
         sprite.look.yInUserInterfaceDimensionUnit = 0f
 
diff --git a/gradle.properties b/gradle.properties
index c861ba52052..51b565b6dce 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,4 +36,4 @@ android.nonTransitiveRClass=false
 android.nonFinalResIds=false
 
 # Enabled parallel sync for Gradle 9.4+
-org.gradle.tooling.parallel=true
+org.gradle.tooling.parallel=false

From 46e390e647af6114f8dcc34264e98769384c29c5 Mon Sep 17 00:00:00 2001
From: rinaschedl <rinaschedl@gmx.at>
Date: Wed, 2 Sep 2026 20:36:14 +0200
Subject: [PATCH 4/7] Merged gradle und run settings from develop in
 Catroid-1106 to fix the problem with the testpipeline

---
 .run/Pull Request Suite.run.xml | 15 ++++++++++++---
 .run/Testrunner Tests.run.xml   | 19 ++++++++++---------
 gradle.properties               |  3 ---
 settings.gradle                 |  4 +---
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.run/Pull Request Suite.run.xml b/.run/Pull Request Suite.run.xml
index f31ae8bf46a..c53e674febf 100644
--- a/.run/Pull Request Suite.run.xml	
+++ b/.run/Pull Request Suite.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Pull Request Suite" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
-    <module name="catrobat.catroid" />
-    <option name="ANDROID_TEST_RUN_CONFIGURATION_SCHEMA_VERSION" value="0" />
+    <module name="Catroid.catroid.androidTest" />
     <option name="TESTING_TYPE" value="2" />
     <option name="METHOD_NAME" value="" />
     <option name="CLASS_NAME" value="org.catrobat.catroid.testsuites.UiEspressoPullRequestTriggerSuite" />
@@ -9,9 +8,15 @@
     <option name="TEST_NAME_REGEX" value="" />
     <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
     <option name="EXTRA_OPTIONS" value="" />
+    <option name="RETENTION_ENABLED" value="No" />
+    <option name="RETENTION_MAX_SNAPSHOTS" value="2" />
+    <option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />
     <Auto>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -20,6 +25,7 @@
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
       <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Auto>
     <Hybrid>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -28,9 +34,11 @@
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
       <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Hybrid>
     <Java>
       <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Java>
     <Native>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -39,12 +47,13 @@
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
       <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
+      <option name="DEBUG_SANDBOX_SDK" value="false" />
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="LeakCanary" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>
diff --git a/.run/Testrunner Tests.run.xml b/.run/Testrunner Tests.run.xml
index ac13c9b83f1..21e79589a59 100644
--- a/.run/Testrunner Tests.run.xml	
+++ b/.run/Testrunner Tests.run.xml	
@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Testrunner Tests" type="AndroidTestRunConfigurationType" factoryName="Android Instrumented Tests">
-    <module name="catrobat.catroid" />
-    <option name="ANDROID_TEST_RUN_CONFIGURATION_SCHEMA_VERSION" value="0" />
+    <module name="Catroid.catroid.androidTest" />
     <option name="TESTING_TYPE" value="1" />
     <option name="METHOD_NAME" value="" />
     <option name="CLASS_NAME" value="" />
@@ -9,9 +8,15 @@
     <option name="TEST_NAME_REGEX" value="" />
     <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
     <option name="EXTRA_OPTIONS" value="" />
+    <option name="RETENTION_ENABLED" value="No" />
+    <option name="RETENTION_MAX_SNAPSHOTS" value="2" />
+    <option name="RETENTION_COMPRESS_SNAPSHOTS" value="false" />
     <option name="CLEAR_LOGCAT" value="false" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Auto" />
     <Auto>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -19,7 +24,6 @@
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
     </Auto>
     <Hybrid>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
@@ -27,26 +31,23 @@
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
     </Hybrid>
-    <Java>
-      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
-    </Java>
+    <Java />
     <Native>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
       <option name="SHOW_STATIC_VARS" value="true" />
       <option name="WORKING_DIR" value="" />
       <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
       <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-      <option name="ATTACH_ON_WAIT_FOR_DEBUGGER" value="false" />
     </Native>
     <Profilers>
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="LeakCanary" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+      <option name="PROFILING_MODE" value="NOT_SET" />
     </Profilers>
     <method v="2">
       <option name="Android.Gradle.BeforeRunTask" enabled="true" />
diff --git a/gradle.properties b/gradle.properties
index 51b565b6dce..c282ae38701 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,6 +34,3 @@ android.enableJetifier=true
 org.gradle.caching=false
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false
-
-# Enabled parallel sync for Gradle 9.4+
-org.gradle.tooling.parallel=false
diff --git a/settings.gradle b/settings.gradle
index 88844359a41..14507ac3c9b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,4 @@
-plugins {
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.10.0'
-}/*
+/*
  * Catroid: An on-device visual programming system for Android devices
  * Copyright (C) 2010-2025 The Catrobat Team
  * (<http://developer.catrobat.org/credits>)

From e05b0050b29d1269c9711b2885fc115d1c5a532f Mon Sep 17 00:00:00 2001
From: rinaschedl <rinaschedl@gmx.at>
Date: Fri, 4 Sep 2026 10:05:14 +0200
Subject: [PATCH 5/7] Back roll ActionFactory to development state and only
 integrate new action for the GlideToPosition actions. Warnings of deprecated
 stays in the ActionFactory

---
 .../catroid/content/ActionFactory.java        | 243 +++++++++---------
 1 file changed, 119 insertions(+), 124 deletions(-)

diff --git a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
index 0894c19fa8a..25e9290a19a 100644
--- a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
+++ b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
@@ -238,7 +238,7 @@ public EventAction createUserBrickAction(Sprite sprite, SequenceAction sequence,
 			List<UserDefinedBrickInput> userDefinedBrickInputs, UUID userDefinedBrickID) {
 		UserDefinedBrickAction action = action(UserDefinedBrickAction.class);
 
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setInputs(userDefinedBrickInputs);
 		action.setUserDefinedBrickID(userDefinedBrickID);
@@ -256,7 +256,7 @@ public EventAction createBroadcastAction(String broadcastMessage, boolean wait)
 
 	public Action createWaitAction(Sprite sprite, SequenceAction sequence, Formula delay) {
 		WaitAction action = action(WaitAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDelay(delay);
 		return action;
@@ -266,7 +266,7 @@ public Action createWaitForSoundAction(Sprite sprite, SequenceAction sequence, F
 			String soundFilePath) {
 		WaitForSoundAction action = action(WaitForSoundAction.class);
 		action.setSoundFilePath(soundFilePath);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDelay(delay);
 		return action;
@@ -275,7 +275,7 @@ public Action createWaitForSoundAction(Sprite sprite, SequenceAction sequence, F
 	public Action createPlaySoundAtAction(Sprite sprite, SequenceAction sequence, Formula delay,
 			SoundInfo sound) {
 		PlaySoundAtAction action = action(PlaySoundAtAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setSprite(sprite);
 		action.setSound(sound);
 		action.setScope(scope);
@@ -283,10 +283,9 @@ public Action createPlaySoundAtAction(Sprite sprite, SequenceAction sequence, Fo
 		return action;
 	}
 
-	public Action createWaitForBubbleBrickAction(Sprite sprite, SequenceAction sequence,
-			Formula delay) {
+	public Action createWaitForBubbleBrickAction(Sprite sprite, SequenceAction sequence, Formula delay) {
 		WaitForBubbleBrickAction action = Actions.action(WaitForBubbleBrickAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDelay(delay);
 		return action;
@@ -295,7 +294,7 @@ public Action createWaitForBubbleBrickAction(Sprite sprite, SequenceAction seque
 	public Action createChangeBrightnessByNAction(Sprite sprite, SequenceAction sequence,
 			Formula changeBrightness) {
 		ChangeBrightnessByNAction action = Actions.action(ChangeBrightnessByNAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setBrightness(changeBrightness);
 		return action;
@@ -304,7 +303,7 @@ public Action createChangeBrightnessByNAction(Sprite sprite, SequenceAction sequ
 	public Action createChangeColorByNAction(Sprite sprite, SequenceAction sequence,
 			Formula changeColor) {
 		ChangeColorByNAction action = Actions.action(ChangeColorByNAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setColor(changeColor);
 		return action;
@@ -313,7 +312,7 @@ public Action createChangeColorByNAction(Sprite sprite, SequenceAction sequence,
 	public Action createChangeTransparencyByNAction(Sprite sprite, SequenceAction sequence,
 			Formula transparency) {
 		ChangeTransparencyByNAction action = Actions.action(ChangeTransparencyByNAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setTransparency(transparency);
 		return action;
@@ -321,25 +320,23 @@ public Action createChangeTransparencyByNAction(Sprite sprite, SequenceAction se
 
 	public Action createChangeSizeByNAction(Sprite sprite, SequenceAction sequence, Formula size) {
 		ChangeSizeByNAction action = Actions.action(ChangeSizeByNAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSize(size);
 		return action;
 	}
 
-	public Action createChangeVolumeByNAction(Sprite sprite, SequenceAction sequence,
-			Formula volume) {
+	public Action createChangeVolumeByNAction(Sprite sprite, SequenceAction sequence, Formula volume) {
 		ChangeVolumeByNAction action = Actions.action(ChangeVolumeByNAction.class);
 		action.setVolume(volume);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
 
-	public Action createChangeXByNAction(Sprite sprite, SequenceAction sequence,
-			Formula xMovement) {
+	public Action createChangeXByNAction(Sprite sprite, SequenceAction sequence, Formula xMovement) {
 		ChangeXByNAction action = Actions.action(ChangeXByNAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setxMovement(xMovement);
 		return action;
@@ -347,7 +344,7 @@ public Action createChangeXByNAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createChangeYByNAction(Sprite sprite, SequenceAction sequence, Formula yMovement) {
 		ChangeYByNAction action = Actions.action(ChangeYByNAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setyMovement(yMovement);
 		return action;
@@ -377,7 +374,7 @@ public Action createGlideToAction(Sprite sprite, SequenceAction sequence, Formul
 		GlideToAction action = Actions.action(GlideToAction.class);
 		action.setPosition(x, y);
 		action.setDuration(duration);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -385,7 +382,7 @@ public Action createGlideToAction(Sprite sprite, SequenceAction sequence, Formul
 	public Action createGlideToPositionAction(Sprite sprite,
 			Sprite destinationSprite, SequenceAction sequence,
 			Formula duration, int spinnerSelection) throws InterpretationException {
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		switch (spinnerSelection) {
 			case BrickValues.GLIDE_TO_RANDOM_POSITION:
 				GlideToRandomPositionAction randomAction =
@@ -416,7 +413,7 @@ public Action createPlaceAtAction(Sprite sprite, SequenceAction sequence, Formul
 		action.setPosition(x, y);
 		action.setDuration(0);
 		action.setInterpolation(null);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -444,7 +441,7 @@ public Action createGoToAction(Sprite sprite, Sprite destinationSprite, int spin
 
 	public Action createGoNStepsBackAction(Sprite sprite, SequenceAction sequence, Formula steps) {
 		GoNStepsBackAction action = Actions.action(GoNStepsBackAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSteps(steps);
 		return action;
@@ -467,7 +464,7 @@ public Action createLegoNxtMotorMoveAction(Sprite sprite, SequenceAction sequenc
 			LegoNxtMotorMoveBrick.Motor motorEnum, Formula speed) {
 		LegoNxtMotorMoveAction action = Actions.action(LegoNxtMotorMoveAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSpeed(speed);
 		return action;
@@ -483,7 +480,7 @@ public Action createLegoNxtMotorTurnAngleAction(Sprite sprite, SequenceAction se
 			LegoNxtMotorTurnAngleBrick.Motor motorEnum, Formula degrees) {
 		LegoNxtMotorTurnAngleAction action = Actions.action(LegoNxtMotorTurnAngleAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegrees(degrees);
 		return action;
@@ -493,7 +490,7 @@ public Action createLegoNxtPlayToneAction(Sprite sprite, SequenceAction sequence
 			Formula durationInSeconds) {
 		LegoNxtPlayToneAction action = Actions.action(LegoNxtPlayToneAction.class);
 		action.setHertz(hertz);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationInSeconds(durationInSeconds);
 		return action;
@@ -502,7 +499,7 @@ public Action createLegoNxtPlayToneAction(Sprite sprite, SequenceAction sequence
 	public Action createLegoEv3SingleMotorMoveAction(Sprite sprite, SequenceAction sequence,
 			LegoEv3MotorMoveBrick.Motor motorEnum, Formula speed) {
 		LegoEv3MotorMoveAction action = action(LegoEv3MotorMoveAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setMotorEnum(motorEnum);
 		action.setSpeed(speed);
@@ -525,7 +522,7 @@ public Action createLegoEv3PlayToneAction(Sprite sprite, SequenceAction sequence
 			Formula hertz, Formula durationInSeconds, Formula volumeInPercent) {
 		LegoEv3PlayToneAction action = action(LegoEv3PlayToneAction.class);
 		action.setHertz(hertz);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationInSeconds(durationInSeconds);
 		action.setVolumeInPercent(volumeInPercent);
@@ -536,7 +533,7 @@ public Action createLegoEv3MotorTurnAngleAction(Sprite sprite, SequenceAction se
 			LegoEv3MotorTurnAngleBrick.Motor motorEnum, Formula degrees) {
 		LegoEv3MotorTurnAngleAction action = action(LegoEv3MotorTurnAngleAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegrees(degrees);
 		return action;
@@ -546,7 +543,7 @@ public Action createPhiroPlayToneActionAction(Sprite sprite, SequenceAction sequ
 			PhiroPlayToneBrick.Tone toneEnum, Formula duration) {
 		PhiroPlayToneAction action = action(PhiroPlayToneAction.class);
 		action.setSelectedTone(toneEnum);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationInSeconds(duration);
 		return action;
@@ -556,7 +553,7 @@ public Action createPhiroMotorMoveForwardActionAction(Sprite sprite, SequenceAct
 			PhiroMotorMoveForwardBrick.Motor motorEnum, Formula speed) {
 		PhiroMotorMoveForwardAction action = action(PhiroMotorMoveForwardAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSpeed(speed);
 		return action;
@@ -566,7 +563,7 @@ public Action createPhiroMotorMoveBackwardActionAction(Sprite sprite, SequenceAc
 			PhiroMotorMoveBackwardBrick.Motor motorEnum, Formula speed) {
 		PhiroMotorMoveBackwardAction action = action(PhiroMotorMoveBackwardAction.class);
 		action.setMotorEnum(motorEnum);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSpeed(speed);
 		return action;
@@ -575,7 +572,7 @@ public Action createPhiroMotorMoveBackwardActionAction(Sprite sprite, SequenceAc
 	public Action createPhiroRgbLedEyeActionAction(Sprite sprite, SequenceAction sequence,
 			PhiroRGBLightBrick.Eye eye, Formula red, Formula green, Formula blue) {
 		PhiroRGBLightAction action = action(PhiroRGBLightAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setEyeEnum(eye);
 		action.setRed(red);
@@ -587,7 +584,7 @@ public Action createPhiroRgbLedEyeActionAction(Sprite sprite, SequenceAction seq
 	public Action createPhiroSendSelectedSensorAction(Sprite sprite, SequenceAction sequence,
 			int sensorNumber, Action ifAction, Action elseAction) {
 		PhiroSensorAction action = action(PhiroSensorAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSensor(sensorNumber);
 		action.setIfAction(ifAction);
@@ -603,7 +600,7 @@ public Action createPhiroMotorStopActionAction(PhiroMotorStopBrick.Motor motorEn
 
 	public Action createMoveNStepsAction(Sprite sprite, SequenceAction sequence, Formula steps) {
 		MoveNStepsAction action = Actions.action(MoveNStepsAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSteps(steps);
 		return action;
@@ -661,7 +658,7 @@ public Action createArcAction(Sprite sprite, SequenceAction sequence,
 			ArcBrick.Directions direction,
 			Formula radius, Formula degrees) {
 		ArcAction action = Actions.action(ArcAction.class);
-		action.setScope(new Scope(get(ProjectManager.class).getCurrentProject(), sprite,
+		action.setScope(new Scope(ProjectManager.getInstance().getCurrentProject(), sprite,
 				sequence));
 		action.setDirection(direction);
 		action.setRadius(radius);
@@ -676,7 +673,7 @@ public Action createArcAction(Sprite sprite, SequenceAction sequence,
 	public Action createGoThroughAction(Sprite sprite, SequenceAction sequence,
 			Formula x1, Formula y1, Formula x2, Formula y2) {
 		GoThroughAction action = Actions.action(GoThroughAction.class);
-		action.setScope(new Scope(get(ProjectManager.class).getCurrentProject(), sprite,
+		action.setScope(new Scope(ProjectManager.getInstance().getCurrentProject(), sprite,
 				sequence));
 		action.setTargetCoordinates(x1, y1, x2, y2);
 
@@ -688,7 +685,7 @@ public Action createGoThroughAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createSetPenSizeAction(Sprite sprite, SequenceAction sequence, Formula penSize) {
 		SetPenSizeAction action = Actions.action(SetPenSizeAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPenSize(penSize);
 		return action;
@@ -697,7 +694,7 @@ public Action createSetPenSizeAction(Sprite sprite, SequenceAction sequence, For
 	public Action createSetPenColorAction(Sprite sprite, SequenceAction sequence, Formula red,
 			Formula green, Formula blue) {
 		SetPenColorAction action = Actions.action(SetPenColorAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setRed(red);
 		action.setGreen(green);
@@ -712,7 +709,7 @@ public Action createClearBackgroundAction() {
 	public Action createSetCameraFocusPointAction(Sprite sprite, SequenceAction sequence,
 			Formula horizontal, Formula vertical) {
 		SetCameraFocusPointAction action = action(SetCameraFocusPointAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSprite(sprite);
 		action.setHorizontal(horizontal);
@@ -742,7 +739,7 @@ public Action createStopSoundAction(Sprite sprite, SoundInfo sound) {
 
 	public Action createPointInDirectionAction(Sprite sprite, SequenceAction sequence, Formula degrees) {
 		PointInDirectionAction action = Actions.action(PointInDirectionAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegreesInUserInterfaceDimensionUnit(degrees);
 		return action;
@@ -769,7 +766,7 @@ public Action createDeleteThisCloneAction(Sprite sprite) {
 
 	public Action createSetBrightnessAction(Sprite sprite, SequenceAction sequence, Formula brightness) {
 		SetBrightnessAction action = Actions.action(SetBrightnessAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setBrightness(brightness);
 		return action;
@@ -777,7 +774,7 @@ public Action createSetBrightnessAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createSetColorAction(Sprite sprite, SequenceAction sequence, Formula color) {
 		SetColorAction action = Actions.action(SetColorAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setColor(color);
 		return action;
@@ -786,7 +783,7 @@ public Action createSetColorAction(Sprite sprite, SequenceAction sequence, Formu
 	public Action createSetTransparencyAction(Sprite sprite, SequenceAction sequence,
 			Formula transparency) {
 		SetTransparencyAction action = Actions.action(SetTransparencyAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setTransparency(transparency);
 		return action;
@@ -807,8 +804,7 @@ public Action createSetLookAction(Sprite sprite, LookData lookData, boolean wait
 	public Action createSetLookByIndexAction(Sprite sprite, SequenceAction sequence, Formula formula) {
 		SetLookByIndexAction action = Actions.action(SetLookByIndexAction.class);
 		action.setSprite(sprite);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite,
-				sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(formula);
 		return action;
@@ -816,7 +812,7 @@ public Action createSetLookByIndexAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createSetBackgroundAction(LookData lookData, boolean wait) {
 		SetLookAction action = Actions.action(SetLookAction.class);
-		action.setSprite(get(ProjectManager.class).getCurrentlyPlayingScene().getBackgroundSprite());
+		action.setSprite(ProjectManager.getInstance().getCurrentlyPlayingScene().getBackgroundSprite());
 		action.setLookData(lookData);
 		action.setWait(wait);
 		return action;
@@ -825,8 +821,8 @@ public Action createSetBackgroundAction(LookData lookData, boolean wait) {
 	public Action createSetBackgroundByIndexAction(Sprite sprite, SequenceAction sequence,
 			Formula formula, boolean wait) {
 		SetLookByIndexAction action = Actions.action(SetLookByIndexAction.class);
-		action.setSprite(get(ProjectManager.class).getCurrentlyPlayingScene().getBackgroundSprite());
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		action.setSprite(ProjectManager.getInstance().getCurrentlyPlayingScene().getBackgroundSprite());
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(formula);
 		action.setWait(wait);
@@ -836,7 +832,7 @@ public Action createSetBackgroundByIndexAction(Sprite sprite, SequenceAction seq
 	public Action createSetNextLookAction(Sprite sprite, SequenceAction sequence) {
 		SetNextLookAction action = Actions.action(SetNextLookAction.class);
 		action.setSprite(sprite);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -844,7 +840,7 @@ public Action createSetNextLookAction(Sprite sprite, SequenceAction sequence) {
 	public Action createSetPreviousLookAction(Sprite sprite, SequenceAction sequence) {
 		SetPreviousLookAction action = action(SetPreviousLookAction.class);
 		action.setSprite(sprite);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -857,7 +853,7 @@ public Action createDeleteLookAction(Sprite sprite) {
 
 	public Action createSetSizeToAction(Sprite sprite, SequenceAction sequence, Formula size) {
 		SetSizeToAction action = Actions.action(SetSizeToAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSize(size);
 		return action;
@@ -868,7 +864,7 @@ public Action createGlideToPhysicsAction(Sprite sprite, PhysicsLook physicsLook,
 			Formula y, float duration, float delta) {
 
 		GlideToPhysicsAction action = Actions.action(GlideToPhysicsAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPhysicsLook(physicsLook);
 		action.setPosition(x, y);
@@ -880,14 +876,14 @@ public Action createGlideToPhysicsAction(Sprite sprite, PhysicsLook physicsLook,
 	public Action createSetVolumeToAction(Sprite sprite, SequenceAction sequence, Formula volume) {
 		SetVolumeToAction action = Actions.action(SetVolumeToAction.class);
 		action.setVolume(volume);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
 
 	public Action createSetXAction(Sprite sprite, SequenceAction sequence, Formula x) {
 		SetXAction action = Actions.action(SetXAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setX(x);
 		return action;
@@ -895,7 +891,7 @@ public Action createSetXAction(Sprite sprite, SequenceAction sequence, Formula x
 
 	public Action createSetYAction(Sprite sprite, SequenceAction sequence, Formula y) {
 		SetYAction action = Actions.action(SetYAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setY(y);
 		return action;
@@ -910,7 +906,7 @@ public Action createShowAction(Sprite sprite) {
 
 	public Action createSpeakAction(Sprite sprite, SequenceAction sequence, Formula text) {
 		SpeakAction action = action(SpeakAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setSpeechSynthesizer(new SpeechSynthesizer(scope, text));
 		action.setMobileServiceAvailability(get(MobileServiceAvailability.class));
 		action.setContext(StageActivity.activeStageActivity.get());
@@ -920,7 +916,7 @@ public Action createSpeakAction(Sprite sprite, SequenceAction sequence, Formula
 
 	public Action createSpeakAndWaitAction(Sprite sprite, SequenceAction sequence, Formula text) {
 		SpeakAndWaitAction action = action(SpeakAndWaitAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setSpeechSynthesizer(new SpeechSynthesizer(scope, text));
 		action.setMobileServiceAvailability(get(MobileServiceAvailability.class));
 		action.setContext(StageActivity.activeStageActivity.get());
@@ -933,7 +929,7 @@ public Action createStopAllSoundsAction() {
 
 	public Action createPauseForBeatsAction(Sprite sprite, SequenceAction sequence, Formula beats) {
 		PauseForBeatsAction action = action(PauseForBeatsAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setBeats(beats);
 		return action;
@@ -942,7 +938,7 @@ public Action createPauseForBeatsAction(Sprite sprite, SequenceAction sequence,
 	public Action createPlayNoteForBeatsAction(Sprite sprite, SequenceAction sequence, Formula note,
 			Formula beats) {
 		PlayNoteForBeatsAction action = action(PlayNoteForBeatsAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setMidiValue(note);
 		action.setBeats(beats);
@@ -957,7 +953,7 @@ public Action createSetInstrumentAction(PickableMusicalInstrument instrument) {
 
 	public Action createSetTempoAction(Sprite sprite, SequenceAction sequence, Formula tempo) {
 		SetTempoAction action = action(SetTempoAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setTempo(tempo);
 		return action;
@@ -965,7 +961,7 @@ public Action createSetTempoAction(Sprite sprite, SequenceAction sequence, Formu
 
 	public Action createChangeTempoAction(Sprite sprite, SequenceAction sequence, Formula tempo) {
 		ChangeTempoByAction action = action(ChangeTempoByAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setTempo(tempo);
 		return action;
@@ -974,7 +970,7 @@ public Action createChangeTempoAction(Sprite sprite, SequenceAction sequence, Fo
 	public Action createPlayDrumForBeatsAction(Sprite sprite, SequenceAction sequence, Formula beats,
 			PickableDrum drum) {
 		PlayDrumForBeatsAction action = action(PlayDrumForBeatsAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setBeats(beats);
 		action.setDrum(drum);
@@ -983,7 +979,7 @@ public Action createPlayDrumForBeatsAction(Sprite sprite, SequenceAction sequenc
 
 	public Action createTurnLeftAction(Sprite sprite, SequenceAction sequence, Formula degrees) {
 		TurnLeftAction action = Actions.action(TurnLeftAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegrees(degrees);
 		return action;
@@ -991,7 +987,7 @@ public Action createTurnLeftAction(Sprite sprite, SequenceAction sequence, Formu
 
 	public Action createTurnRightAction(Sprite sprite, SequenceAction sequence, Formula degrees) {
 		TurnRightAction action = Actions.action(TurnRightAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDegrees(degrees);
 		return action;
@@ -999,7 +995,7 @@ public Action createTurnRightAction(Sprite sprite, SequenceAction sequence, Form
 
 	public Action createChangeVariableAction(Sprite sprite, SequenceAction sequence, Formula variableFormula, UserVariable userVariable) {
 		ChangeVariableAction action = Actions.action(ChangeVariableAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setChangeVariable(variableFormula);
 		action.setUserVariable(userVariable);
@@ -1009,7 +1005,7 @@ public Action createChangeVariableAction(Sprite sprite, SequenceAction sequence,
 	public Action createSetVariableAction(Sprite sprite, SequenceAction sequence, Formula variableFormula,
 			UserVariable userVariable) {
 		SetVariableAction action = Actions.action(SetVariableAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setChangeVariable(variableFormula);
 		action.setUserVariable(userVariable);
@@ -1019,7 +1015,7 @@ public Action createSetVariableAction(Sprite sprite, SequenceAction sequence, Fo
 	public Action createAskAction(Sprite sprite, SequenceAction sequence, Formula questionFormula,
 			UserVariable answerVariable) {
 		AskAction action = Actions.action(AskAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setQuestionFormula(questionFormula);
 		action.setAnswerVariable(answerVariable);
@@ -1029,7 +1025,7 @@ public Action createAskAction(Sprite sprite, SequenceAction sequence, Formula qu
 	public Action createAskSpeechAction(Sprite sprite, SequenceAction sequence, Formula questionFormula,
 			UserVariable answerVariable) {
 		AskSpeechAction action = Actions.action(AskSpeechAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setQuestionFormula(questionFormula);
 		action.setAnswerVariable(answerVariable);
@@ -1039,7 +1035,7 @@ public Action createAskSpeechAction(Sprite sprite, SequenceAction sequence, Form
 	public Action createDeleteItemOfUserListAction(Sprite sprite, SequenceAction sequence,
 			Formula userListFormula, UserList userList) {
 		DeleteItemOfUserListAction action = action(DeleteItemOfUserListAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaIndexToDelete(userListFormula);
 		action.setUserList(userList);
@@ -1055,7 +1051,7 @@ public Action createClearUserListAction(UserList userList) {
 	public Action createAddItemToUserListAction(Sprite sprite, SequenceAction sequence,
 			Formula userListFormula, UserList userList) {
 		AddItemToUserListAction action = action(AddItemToUserListAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaItemToAdd(userListFormula);
 		action.setUserList(userList);
@@ -1066,7 +1062,7 @@ public Action createInsertItemIntoUserListAction(Sprite sprite, SequenceAction s
 			Formula userListFormulaIndexToInsert,
 			Formula userListFormulaItemToInsert, UserList userList) {
 		InsertItemIntoUserListAction action = action(InsertItemIntoUserListAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaIndexToInsert(userListFormulaIndexToInsert);
 		action.setFormulaItemToInsert(userListFormulaItemToInsert);
@@ -1077,7 +1073,7 @@ public Action createInsertItemIntoUserListAction(Sprite sprite, SequenceAction s
 	public Action createStoreCSVIntoUserListAction(Sprite sprite, SequenceAction sequence,
 			Formula userListFormulaColumn, Formula userListFormulaCSV, UserList userList) {
 		StoreCSVIntoUserListAction action = action(StoreCSVIntoUserListAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaColumnToExtract(userListFormulaColumn);
 		action.setFormulaCSVData(userListFormulaCSV);
@@ -1089,7 +1085,7 @@ public Action createReplaceItemInUserListAction(Sprite sprite, SequenceAction se
 			Formula userListFormulaIndexToReplace,
 			Formula userListFormulaItemToInsert, UserList userList) {
 		ReplaceItemInUserListAction action = action(ReplaceItemInUserListAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormulaIndexToReplace(userListFormulaIndexToReplace);
 		action.setFormulaItemToInsert(userListFormulaItemToInsert);
@@ -1105,7 +1101,7 @@ public Action createThinkSayBubbleAction(Sprite sprite, SequenceAction sequence,
 			AndroidStringProvider androidStringProvider, Formula text, int type) {
 		ThinkSayBubbleAction action = action(ThinkSayBubbleAction.class);
 		action.setText(text);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setAndroidStringProvider(androidStringProvider);
 		action.setType(type);
@@ -1116,7 +1112,7 @@ public Action createThinkSayForBubbleAction(Sprite sprite, SequenceAction sequen
 			AndroidStringProvider androidStringProvider, Formula text, int type) {
 		ThinkSayBubbleAction action = action(ThinkSayBubbleAction.class);
 		action.setText(text);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setAndroidStringProvider(androidStringProvider);
 		action.setType(type);
@@ -1143,7 +1139,7 @@ public Action createIfLogicAction(Sprite sprite, SequenceAction sequence, Formul
 		action.setIfAction(ifAction);
 		action.setIfCondition(condition);
 		action.setElseAction(elseAction);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -1153,7 +1149,7 @@ public Action createRepeatAction(Sprite sprite, SequenceAction sequence, Formula
 		RepeatAction action = Actions.action(RepeatAction.class);
 		action.setRepeatCount(count);
 		action.setAction(repeatedAction);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLoopDelay(isLoopDelay);
 		return action;
@@ -1166,7 +1162,7 @@ public Action createForVariableFromToAction(Sprite sprite,
 		action.setRange(from, to);
 		action.setControlVariable(controlVariable);
 		action.setAction(repeatedAction);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLoopDelay(isLoopDelay);
 		return action;
@@ -1184,7 +1180,7 @@ public Action createForItemInUserListAction(UserList userList,
 
 	public Action createWaitUntilAction(Sprite sprite, SequenceAction sequence, Formula condition) {
 		WaitUntilAction action = Actions.action(WaitUntilAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setCondition(condition);
 		return action;
@@ -1195,7 +1191,7 @@ public Action createRepeatUntilAction(Sprite sprite, SequenceAction sequence, Fo
 		RepeatUntilAction action = action(RepeatUntilAction.class);
 		action.setRepeatCondition(condition);
 		action.setAction(repeatedAction);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLoopDelay(isLoopDelay);
 		return action;
@@ -1203,7 +1199,7 @@ public Action createRepeatUntilAction(Sprite sprite, SequenceAction sequence, Fo
 
 	public Action createDelayAction(Sprite sprite, SequenceAction sequence, Formula delay) {
 		WaitAction action = Actions.action(WaitAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDelay(delay);
 		return action;
@@ -1214,7 +1210,7 @@ public Action createForeverAction(Sprite sprite, SequenceAction sequence, Script
 		RepeatAction action = Actions.action(RepeatAction.class);
 		action.setForeverRepeat(true);
 		action.setAction(foreverSequence);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLoopDelay(isLoopDelay);
 		return action;
@@ -1228,7 +1224,7 @@ public static Action createStitchAction(Sprite sprite) {
 
 	public Action createRunningStitchAction(Sprite sprite, SequenceAction sequence, Formula length) {
 		RunningStitchAction action = Actions.action(RunningStitchAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLength(length);
 		return action;
@@ -1236,7 +1232,7 @@ public Action createRunningStitchAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createTripleStitchAction(Sprite sprite, SequenceAction sequence, Formula steps) {
 		TripleStitchAction action = Actions.action(TripleStitchAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setSteps(steps);
 		return action;
@@ -1245,7 +1241,7 @@ public Action createTripleStitchAction(Sprite sprite, SequenceAction sequence, F
 	public Action createZigZagStitchAction(Sprite sprite, SequenceAction sequence, Formula length,
 			Formula width) {
 		ZigZagStitchAction action = Actions.action(ZigZagStitchAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setLength(length);
 		action.setWidth(width);
@@ -1261,7 +1257,7 @@ public static Action createStopRunningStitchAction(Sprite sprite) {
 	public Action createWriteEmbroideryToFileAction(Sprite sprite, SequenceAction sequence,
 			Formula fileName) {
 		WriteEmbroideryToFileAction action = Actions.action(WriteEmbroideryToFileAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 
@@ -1270,7 +1266,7 @@ public Action createWriteEmbroideryToFileAction(Sprite sprite, SequenceAction se
 
 	public Action createSavePlotAction(Sprite sprite, SequenceAction sequence, Formula fileName) {
 		SavePlotAction action = Actions.action(SavePlotAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 		return action;
@@ -1278,7 +1274,7 @@ public Action createSavePlotAction(Sprite sprite, SequenceAction sequence, Formu
 
 	public Action createSaveLaserAction(Sprite sprite, SequenceAction sequence, Formula fileName) {
 		SaveLaserAction action = Actions.action(SaveLaserAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 		return action;
@@ -1286,7 +1282,7 @@ public Action createSaveLaserAction(Sprite sprite, SequenceAction sequence, Form
 
 	public Action createSharePlotAction(Sprite sprite, SequenceAction sequence, Formula fileName) {
 		SharePlotAction action = Actions.action(SharePlotAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 		return action;
@@ -1294,7 +1290,7 @@ public Action createSharePlotAction(Sprite sprite, SequenceAction sequence, Form
 
 	public Action createShareLaserAction(Sprite sprite, SequenceAction sequence, Formula fileName) {
 		ShareLaserAction action = Actions.action(ShareLaserAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(fileName);
 		return action;
@@ -1308,7 +1304,7 @@ public Action createSewUpAction(Sprite sprite) {
 
 	public Action createSetThreadColorAction(Sprite sprite, SequenceAction sequence, Formula color) {
 		SetThreadColorAction action = Actions.action(SetThreadColorAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setSprite(sprite);
 		action.setScope(scope);
 		action.setColor(color);
@@ -1363,7 +1359,7 @@ public Action createSetTextAction(Sprite sprite, SequenceAction sequence, Formul
 		action.setPosition(x, y);
 		action.setText(text);
 		action.setDuration(5);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -1373,7 +1369,7 @@ public Action createShowVariableAction(Sprite sprite, SequenceAction sequence, F
 		ShowTextAction action = action(ShowTextAction.class);
 		action.setPosition(xPosition, yPosition);
 		action.setVariableToShow(userVariable);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setAndroidStringProvider(androidStringProvider);
 		return action;
@@ -1387,7 +1383,7 @@ public Action createShowVariableColorAndSizeAction(Sprite sprite, SequenceAction
 		action.setRelativeTextSize(relativeTextSize);
 		action.setColor(color);
 		action.setVariableToShow(userVariable);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setAlignment(alignment);
 		action.setAndroidStringProvider(androidStringProvider);
@@ -1411,7 +1407,7 @@ public Action createFlashAction(boolean flashOn) {
 
 	public Action createVibrateAction(Sprite sprite, SequenceAction sequence, Formula duration) {
 		VibrateAction action = action(VibrateAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDuration(duration);
 		return action;
@@ -1427,7 +1423,7 @@ public Action createFadeParticleEffectsAction(Sprite sprite, boolean turnOn) {
 		FadeParticleEffectAction action = action(FadeParticleEffectAction.class);
 		action.setFadeIn(turnOn);
 		action.setSprite(sprite);
-		action.setBackgroundSprite(get(ProjectManager.class).getCurrentlyPlayingScene().getBackgroundSprite());
+		action.setBackgroundSprite(ProjectManager.getInstance().getCurrentlyPlayingScene().getBackgroundSprite());
 		return action;
 	}
 
@@ -1441,7 +1437,7 @@ public Action createAdditiveParticleEffectsAction(Sprite sprite, boolean turnOn)
 	public Action createSetParticleColorAction(Sprite sprite, Formula color, SequenceAction sequence) {
 		SetParticleColorAction action = action(SetParticleColorAction.class);
 		action.setColor(color);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		return action;
 	}
@@ -1461,7 +1457,7 @@ public Action createSetBackCameraAction() {
 	public Action createSendDigitalArduinoValueAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Formula pinValue) {
 		ArduinoSendDigitalValueAction action = action(ArduinoSendDigitalValueAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumber(pinNumber);
 		action.setPinValue(pinValue);
@@ -1471,7 +1467,7 @@ public Action createSendDigitalArduinoValueAction(Sprite sprite, SequenceAction
 	public Action createSendPWMArduinoValueAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Formula pinValue) {
 		ArduinoSendPWMValueAction action = action(ArduinoSendPWMValueAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumber(pinNumber);
 		action.setPinValue(pinValue);
@@ -1481,7 +1477,7 @@ public Action createSendPWMArduinoValueAction(Sprite sprite, SequenceAction sequ
 	public Action createSendDigitalRaspiValueAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Formula pinValue) {
 		RaspiSendDigitalValueAction action = action(RaspiSendDigitalValueAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumber(pinNumber);
 		action.setPinValue(pinValue);
@@ -1491,7 +1487,7 @@ public Action createSendDigitalRaspiValueAction(Sprite sprite, SequenceAction se
 	public Action createSendRaspiPwmValueAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Formula pwmFrequency, Formula pwmPercentage) {
 		RaspiPwmAction action = action(RaspiPwmAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumberFormula(pinNumber);
 		action.setPwmFrequencyFormula(pwmFrequency);
@@ -1502,7 +1498,7 @@ public Action createSendRaspiPwmValueAction(Sprite sprite, SequenceAction sequen
 	public Action createRaspiIfLogicActionAction(Sprite sprite, SequenceAction sequence,
 			Formula pinNumber, Action ifAction, Action elseAction) {
 		RaspiIfLogicAction action = action(RaspiIfLogicAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPinNumber(pinNumber);
 		action.setIfAction(ifAction);
@@ -1526,11 +1522,10 @@ public Action createStopScriptAction(int spinnerSelection, Script currentScript,
 		}
 	}
 
-	public Action createReportAction(Sprite sprite, SequenceAction sequence, Script currentScript,
-			Formula reportFormula) {
+	public Action createReportAction(Sprite sprite, SequenceAction sequence, Script currentScript, Formula reportFormula) {
 		if (currentScript instanceof UserDefinedScript) {
 			ReportAction reportAction = Actions.action(ReportAction.class);
-			Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+			Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 			reportAction.setScope(scope);
 			reportAction.setCurrentScript(currentScript);
 			reportAction.setReportFormula(reportFormula);
@@ -1544,7 +1539,7 @@ public Action createReportAction(Sprite sprite, SequenceAction sequence, Script
 
 	public Action createSetNfcTagAction(Sprite sprite, SequenceAction sequence, Formula nfcNdefMessage, int nfcNdefSpinnerSelection) {
 		SetNfcTagAction setNfcTagAction = Actions.action(SetNfcTagAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		setNfcTagAction.setScope(scope);
 		setNfcTagAction.setNfcTagNdefSpinnerSelection(nfcNdefSpinnerSelection);
 		setNfcTagAction.setNfcNdefMessage(nfcNdefMessage);
@@ -1558,7 +1553,7 @@ public Action createAssertEqualsAction(Sprite sprite, SequenceAction sequence, F
 		action.setActualFormula(actual);
 		action.setExpectedFormula(expected);
 
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPosition(position);
 
@@ -1571,7 +1566,7 @@ public Action createAssertUserListsAction(Sprite sprite, SequenceAction sequence
 		action.setActualUserList(actual);
 		action.setExpectedUserList(expected);
 
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPosition(position);
 
@@ -1579,7 +1574,7 @@ public Action createAssertUserListsAction(Sprite sprite, SequenceAction sequence
 	}
 
 	public Action createRepeatParameterizedAction(Sprite sprite, ParameterizedData data,
-			List<? extends Pair<UserList, UserVariable>> parameters,
+			List<Pair<UserList, UserVariable>> parameters,
 			String position, Action repeatedAction, boolean isLoopDelay) {
 		RepeatParameterizedAction action = action(RepeatParameterizedAction.class);
 		action.setParameterizedData(data);
@@ -1600,7 +1595,7 @@ public Action createParameterizedAssertAction(Sprite sprite, SequenceAction sequ
 		action.setExpectedList(expected);
 		action.setParameterizedData(data);
 
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setPosition(position);
 
@@ -1615,7 +1610,7 @@ public Action createFinishStageAction(boolean silent) {
 
 	public Action createTapAtAction(Sprite sprite, SequenceAction sequence, Formula x, Formula y) {
 		TapAtAction action = Actions.action(TapAtAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setStartX(x);
 		action.setStartY(y);
@@ -1625,7 +1620,7 @@ public Action createTapAtAction(Sprite sprite, SequenceAction sequence, Formula
 	public Action createTapForAction(Sprite sprite, SequenceAction sequence, Formula x, Formula y,
 			Formula duration) {
 		TapAtAction action = Actions.action(TapAtAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationFormula(duration);
 		action.setStartX(x);
@@ -1636,7 +1631,7 @@ public Action createTapForAction(Sprite sprite, SequenceAction sequence, Formula
 	public Action createTouchAndSlideAction(Sprite sprite, SequenceAction sequence, Formula x, Formula y,
 			Formula xChange, Formula yChange, Formula duration) {
 		TapAtAction action = Actions.action(TapAtAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setDurationFormula(duration);
 		action.setStartX(x);
@@ -1648,7 +1643,7 @@ public Action createTouchAndSlideAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createWriteVariableOnDeviceAction(UserVariable userVariable) {
 		WriteUserDataOnDeviceAction action = Actions.action(WriteUserDataOnDeviceAction.class);
-		File projectDirectory = get(ProjectManager.class).getCurrentProject().getDirectory();
+		File projectDirectory = ProjectManager.getInstance().getCurrentProject().getDirectory();
 		DeviceVariableAccessor accessor = new DeviceVariableAccessor(projectDirectory);
 		action.setUserData(userVariable);
 		action.setAccessor(accessor);
@@ -1659,7 +1654,7 @@ public Action createWriteVariableOnDeviceAction(UserVariable userVariable) {
 	public Action createWriteVariableToFileAction(Sprite sprite, SequenceAction sequence,
 			Formula variableFormula, UserVariable userVariable) {
 		WriteVariableToFileAction action = Actions.action(WriteVariableToFileAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setUserVariable(userVariable);
 		action.setFormula(variableFormula);
@@ -1670,7 +1665,7 @@ public Action createWriteVariableToFileAction(Sprite sprite, SequenceAction sequ
 	public Action createReadVariableFromFileAction(Sprite sprite, SequenceAction sequence, Formula variableFormula,
 			UserVariable userVariable, boolean deleteFile) {
 		ReadVariableFromFileAction action = Actions.action(ReadVariableFromFileAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setUserVariable(userVariable);
 		action.setFormula(variableFormula);
@@ -1681,7 +1676,7 @@ public Action createReadVariableFromFileAction(Sprite sprite, SequenceAction seq
 
 	public Action createWriteListOnDeviceAction(UserList userList) {
 		WriteUserDataOnDeviceAction action = Actions.action(WriteUserDataOnDeviceAction.class);
-		File projectDirectory = get(ProjectManager.class).getCurrentProject().getDirectory();
+		File projectDirectory = ProjectManager.getInstance().getCurrentProject().getDirectory();
 		DeviceUserDataAccessor accessor = new DeviceListAccessor(projectDirectory);
 		UserData data = userList;
 		action.setUserData(data);
@@ -1711,7 +1706,7 @@ public Action createReadListFromDeviceAction(UserList userList) {
 	public Action createWebRequestAction(Sprite sprite, SequenceAction sequence, Formula variableFormula,
 			UserVariable userVariable) {
 		WebRequestAction action = action(WebRequestAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		action.setUserVariable(userVariable);
@@ -1721,7 +1716,7 @@ public Action createWebRequestAction(Sprite sprite, SequenceAction sequence, For
 	public Action createLookRequestAction(Sprite sprite, SequenceAction sequence,
 			Formula variableFormula) {
 		LookRequestAction action = action(LookRequestAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		return action;
@@ -1729,7 +1724,7 @@ public Action createLookRequestAction(Sprite sprite, SequenceAction sequence,
 
 	public Action createOpenUrlAction(Sprite sprite, SequenceAction sequence, Formula variableFormula) {
 		OpenUrlAction action = action(OpenUrlAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		return action;
@@ -1739,7 +1734,7 @@ public Action createStartListeningAction(UserVariable userVariable) {
 		// This is a fix to get the StartListeningBrick to work on Huawei Phones,
 		// can be changed once HMS is fully implemented and working
 		// As soon as this is the case, remove the if-statement and only use the else-branch
-		if (get(MobileServiceAvailability.class).isHmsAvailable(get(ProjectManager.class).getApplicationContext())) {
+		if (get(MobileServiceAvailability.class).isHmsAvailable(ProjectManager.getInstance().getApplicationContext())) {
 			AskSpeechAction action = Actions.action(AskSpeechAction.class);
 			action.setAnswerVariable(userVariable);
 			return action;
@@ -1759,7 +1754,7 @@ public Action createSetListeningLanguageAction(String listeningLanguageTag) {
 	public Action createPaintNewLookAction(Sprite sprite, SequenceAction sequence,
 			Formula variableFormula, SetNextLookAction nextLookAction) {
 		PaintNewLookAction action = action(PaintNewLookAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		action.nextLookAction(nextLookAction);
@@ -1769,7 +1764,7 @@ public Action createPaintNewLookAction(Sprite sprite, SequenceAction sequence,
 	public Action createCopyLookAction(Sprite sprite, SequenceAction sequence, Formula variableFormula,
 			SetNextLookAction nextLookAction) {
 		CopyLookAction action = action(CopyLookAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.setFormula(variableFormula);
 		action.nextLookAction(nextLookAction);
@@ -1779,7 +1774,7 @@ public Action createCopyLookAction(Sprite sprite, SequenceAction sequence, Formu
 	public Action createEditLookAction(Sprite sprite, SequenceAction sequence,
 			SetNextLookAction nextLookAction) {
 		EditLookAction action = action(EditLookAction.class);
-		Scope scope = new Scope(get(ProjectManager.class).getCurrentProject(), sprite, sequence);
+		Scope scope = new Scope(ProjectManager.getInstance().getCurrentProject(), sprite, sequence);
 		action.setScope(scope);
 		action.nextLookAction(nextLookAction);
 		return action;

From 953caeeacf5663c07cfa94f75e05efe5dc035a01 Mon Sep 17 00:00:00 2001
From: rinaschedl <rinaschedl@gmx.at>
Date: Sat, 5 Sep 2026 21:10:12 +0200
Subject: [PATCH 6/7] Back roll ActionFactory to development state and only
 integrate new action for the GlideToPosition actions. Warnings of deprecated
 stays in the ActionFactory

---
 .../main/java/org/catrobat/catroid/content/ActionFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
index 25e9290a19a..086b89b3bbc 100644
--- a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
+++ b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
@@ -1586,7 +1586,7 @@ public Action createRepeatParameterizedAction(Sprite sprite, ParameterizedData d
 		action.setPosition(position);
 
 		return action;
-	}
+gitz	}
 
 	public Action createParameterizedAssertAction(Sprite sprite, SequenceAction sequence, Formula actual, UserList expected,
 			ParameterizedData data, String position) {

From a7107584ebf54c418a1eeafb57606727c0c5db82 Mon Sep 17 00:00:00 2001
From: rinaschedl <rinaschedl@gmx.at>
Date: Tue, 8 Sep 2026 06:38:09 +0200
Subject: [PATCH 7/7] ActionFactory line 1589 deleted

---
 .../main/java/org/catrobat/catroid/content/ActionFactory.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
index 086b89b3bbc..25e9290a19a 100644
--- a/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
+++ b/catroid/src/main/java/org/catrobat/catroid/content/ActionFactory.java
@@ -1586,7 +1586,7 @@ public Action createRepeatParameterizedAction(Sprite sprite, ParameterizedData d
 		action.setPosition(position);
 
 		return action;
-gitz	}
+	}
 
 	public Action createParameterizedAssertAction(Sprite sprite, SequenceAction sequence, Formula actual, UserList expected,
 			ParameterizedData data, String position) {