Adding boundaries and other updates