Final modification to Sroll for now