Modify
Fix regex
Loop fix