Merged Meadowstream's changes