Update to modal code