reworked dependencies