Updated to not use a service