Fixing dependency issues
Fixed completely!