restored some deleted stuff