rebased

Because my thoughts are constantly revisioned ;)