diff --git a/elements/fun/clock.go b/elements/fun/clock.go
index e2c3677..a9e9974 100644
--- a/elements/fun/clock.go
+++ b/elements/fun/clock.go
@@ -23,7 +23,7 @@ type AnalogClock struct {
 func NewAnalogClock (newTime time.Time) (element *AnalogClock) {
 	element = &AnalogClock { }
 	element.theme.Case = theme.C("fun", "clock")
-	element.Core, element.core = core.NewCore(element.draw)
+	element.Core, element.core = core.NewCore(element, element.draw)
 	element.core.SetMinimumSize(64, 64)
 	return
 }
diff --git a/elements/fun/piano.go b/elements/fun/piano.go
index e18cac8..60435f4 100644
--- a/elements/fun/piano.go
+++ b/elements/fun/piano.go
@@ -53,12 +53,12 @@ func NewPiano (low, high music.Octave) (element *Piano) {
 	}
 	
 	element.theme.Case = theme.C("fun", "piano")
-	element.Core, element.core = core.NewCore (func () {
+	element.Core, element.core = core.NewCore (element, func () {
 		element.recalculate()
 		element.draw()
 	})
 	element.FocusableCore,
-	element.focusableControl = core.NewFocusableCore(element.redo)
+	element.focusableControl = core.NewFocusableCore(element.core, element.redo)
 	element.updateMinimumSize()
 	return
 }