Updated proof-of-concept