changed wish and type validations