made some adjustments to 1.3