[NEW] Re5. lots changes