Fixing up main