Added x13 and x15 support