updates for merge with bootstrap