Updated to new base, more coming later