Carl te

Here are a few changes