Refactored for pr#5
And some cassettes