Removed init functions, now calling functions directly