updated everything with latest changes