Final changes version 1.1