Added slight validation