Updated by Abed