Added crude implementation