Done with 1.2 and 1.3