took out str & int