Don't assume array for all values
Removed function of doom