all things have been done, i should commit more often =(