Feature/change compounds