updated for quick setup