Update #2

This pull request should stay for a while, I might add more commits later.