bugfix + further integration