update with rustam's edits