adding ratethat
changing regex a bit