Develop

finalize all changes