Made it more inclusive