adding j7 support