#6690 - Codeing - Finish

Version is ready for testing