Also implement previous commits for pulling