A little validation added