Edited Validation / Code Finalized
Added Validation / Finalized Code