Second remake of my first project