completed make it work completion without error on all possibilities.