Finish 5.10, Add validation