removed more placeholder stuff