Updates + major code redistribution