changes to main.m