Change # per , and do complete depth validation