Update before proof of concept