merging main.c - simple fix - needs to change in feature versions