Simplified the post process and updated the secure token