Completed Version

on live version