remaking project; big update