[TW309] - Core/Scripts: Some changes to previous commits thanks to gecko32