Data Entry - Updated