Made several adjustments for the new system