updated all latest changes