Made it robust