#106 tidied up current samples