rework solo
solo working