Fixes pt.2
Pt.3