Completed Version remove unneccessary code and change configuration