Merged changes form @passerbied