Changed to using strings