UPDATED
ADDED: Unfinished work on 417