System states scripts simplified