Changed to normal system