changed names, added regex library