Replaced ' ' with 'None'