need to do that in a few more spots I think and stop being nice