align to ascendedmasta fork