minor changes to speed things up