more changes to prepare merge