Added system parameter stuff