commit latest changes, unfinished