~ moved to main code