Moved to POST, some cleanup and expanded example