submission, needs still some fixes