V6.0

Finish the scheme