modulized a little