CHANGED to check all incoming params