validation added, final fixed
merged