also need to change validation