re-added many of the removed classes