Redesigned validation [sub.1 on #1]