Added boolean for membranes etc.