Removed gen and out