Now works fully on live website, but we need to change the workflow a bit