merge with unpushed changes from mehmet's repo