Corrected initial version