Updated last update, improved regexp