added the latest changes so far