changed from string operations to regex