Update: refactored and added regex