Let's keep it here for now - it's simpler.