Added new strings and unhardcoded variables