trying to fix validation stuff