update, ported more classes