Refactored release 2.
Refactored release 2 a little more.