working on full fit