Two changes implemented

except the contractor. search..