Version .15. Small revisions to logic