still trying to fix regex