updated for validation part