added repeat and made unwrapping happen with null observer- hope bugs dont slip by because of this change