Added thumbs up and regex tweaks