removed exceptins and as before minor API tweaks