Updated this e2 that freddie wanted