updated setup generator