Good point, should i do this change?