adding latest changes to development4 version