putting back some redundant entries, probably need to brush up on regex