update everything into classes