massive update

changed the whole system