Experimental changes
Fix naming to make POST job easier