basic changes getting ready to plug API in