merge Josh's updates