[NEW] lots changes