ACTUALLY fixed the added functions
fixed compiler update issues: struct initialization