fixng this too