Proc source refactored!