Improve basically every parts