redo startup
more reworking