Tweaking to work with dependencies