Few more changes to speed things up