fault handling added yay