checked in the final version