Really finished Nestrick feature