Reverted to old service script