Merged Amnet's changes that i missed