Upd setup for a more portable style