More work on add computer feature