new experimental stuff for Krista
merge changes