big update of the entire project