Refactorings V1.

Adding hump.