Re-inserted some changes that were overwritten. Always pull before working