First pass 328 support