Last push was ugly - fixing for live demo