added capacity handling