Second testable version

Second testable version