Moved add to the proper place?