Final Version without Client