updated for Starling 1.4