Updated API or LeadPost, some hacks still in code for testing