Edited generators and updated calling methods