updated both files for more service modifications