Removed generator (moved to a branch)