add last 24 support