Switched position and trade output. Removed obsolete main from factory