updated for merge