Updated to work mutltiple times