still trying to fix validation