New fun little helper and updates