Fixed Vlidation, Removed more redundancy