@focusfit: more updates