Includes latest changes