Few modifications to the kogaion version