Implement expanding which is working