Updated with non-working services pt 2