Pulled and pushed again

Big changes everywhere