almost done with all changes for v1.5