update changes

update changes bringing the application to full integration