first updates
Fix defines variables
Fix variables
Fix variables
Fix variables