Final Design rev. 2