[src] Seperating out some of the muck