still need to fix regex