time some improvemets