better pesona state handling