added proper segue / beginning validation