added things to check on first service