Changed ordering #76