main project update
finished and tested