a few changes...[3]