Added felix's assignments