Modified setup