v1.4 adapted