latest changes to work with fasolt