New setup after a complete overhaul