added validation, not workings so take a look at it