several changes that are working!