Added & tested within boundary function