Adding new simpler setup