Final commit for 1.3 version