Some Changes Over The Code