[@Floofenstein] Looks good put them in the CS thread.