re-organizing halfway done