done + added test.