Finalized version 1.2