Copy with new code and bugs fixed.