Working !!!! Fix dependencies problems