Reduced torches to single, add smart orientation detection