Reverted back to Motif toolkit