Updated online and offline forms