update from janinko