added edits after talking with ROnen