Refactored capacity; last commit