Adding Arel's changes