Changes

Changed some code based on suggestions. Still get Invalid UUID