Added more batlte system stuff