Also fixed outline
Merged conflits