Use best_in_place gem from master