Improved mainInc to allow more things