Finalized version 1.1