Added overflow mechanism