Removed screen parameter from setup method