reverting ali's changes