prepare for limits
minor changes