Few more modifications here and there to test variability