added return null to Gowri's part for now