made a few more additions saving to be safe