updated for null