These are my final modifications: