V0.1 Without Regex
Bug Fixed on remove