Added shitty validation