Final changess version 8